X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbus-proxyd%2Fbus-policy.c;h=59cc1d788b42e68b4da4eaaa9d920711cb90570f;hb=fad5a6c66e73d3df20846906121d52159e1f6bf4;hp=15acae2a38f51db271f20c345ffb3c92947b4c2c;hpb=da927ba997d68401563b927f92e6e40e021a8e5c;p=elogind.git

diff --git a/src/bus-proxyd/bus-policy.c b/src/bus-proxyd/bus-policy.c
index 15acae2a3..59cc1d788 100644
--- a/src/bus-proxyd/bus-policy.c
+++ b/src/bus-proxyd/bus-policy.c
@@ -95,8 +95,7 @@ static int file_load(Policy *p, const char *path) {
                 if (r == -EISDIR)
                         return r;
 
-                log_error_errno(r, "Failed to load %s: %m", path);
-                return r;
+                return log_error_errno(r, "Failed to load %s: %m", path);
         }
 
         q = c;
@@ -105,10 +104,8 @@ static int file_load(Policy *p, const char *path) {
                 int t;
 
                 t = xml_tokenize(&q, &name, &xml_state, &line);
-                if (t < 0) {
-                        log_error_errno(t, "XML parse failure in %s: %m", path);
-                        return t;
-                }
+                if (t < 0)
+                        return log_error_errno(t, "XML parse failure in %s: %m", path);
 
                 switch (state) {
 
@@ -671,13 +668,13 @@ static int check_policy_item(PolicyItem *i, const struct policy_check_filter *fi
                 break;
 
         case POLICY_ITEM_USER:
-                if (filter->uid != (uid_t) -1)
+                if (filter->uid != UID_INVALID)
                         if ((streq_ptr(i->name, "*") || (i->uid_valid && i->uid == filter->uid)))
                                 return is_permissive(i);
                 break;
 
         case POLICY_ITEM_GROUP:
-                if (filter->gid != (gid_t) -1)
+                if (filter->gid != GID_INVALID)
                         if ((streq_ptr(i->name, "*") || (i->gid_valid && i->gid == filter->gid)))
                                 return is_permissive(i);
                 break;
@@ -737,7 +734,7 @@ static int policy_check(Policy *p, const struct policy_check_filter *filter) {
 
         verdict = check_policy_items(p->default_items, filter);
 
-        if (filter->gid != (gid_t) -1) {
+        if (filter->gid != GID_INVALID) {
                 items = hashmap_get(p->group_items, UINT32_TO_PTR(filter->gid));
                 if (items) {
                         v = check_policy_items(items, filter);
@@ -746,7 +743,7 @@ static int policy_check(Policy *p, const struct policy_check_filter *filter) {
                 }
         }
 
-        if (filter->uid != (uid_t) -1) {
+        if (filter->uid != UID_INVALID) {
                 items = hashmap_get(p->user_items, UINT32_TO_PTR(filter->uid));
                 if (items) {
                         v = check_policy_items(items, filter);
@@ -894,10 +891,8 @@ int policy_load(Policy *p, char **files) {
                         char **j;
 
                         r = conf_files_list(&l, ".conf", NULL, *i, NULL);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to get configuration file list: %m");
-                                return r;
-                        }
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to get configuration file list: %m");
 
                         STRV_FOREACH(j, l)
                                 file_load(p, *j);