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;
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) {
r = get_user_creds(&u, &i->uid, NULL, NULL, NULL);
if (r < 0) {
- log_error_errno(-r, "Failed to resolve user %s, ignoring policy: %m", u);
+ log_error_errno(r, "Failed to resolve user %s, ignoring policy: %m", u);
free(i);
} else {
PolicyItem *first;
r = get_group_creds(&g, &i->gid);
if (r < 0) {
- log_error_errno(-r, "Failed to resolve group %s, ignoring policy: %m", g);
+ log_error_errno(r, "Failed to resolve group %s, ignoring policy: %m", g);
free(i);
} else {
PolicyItem *first;
r = get_user_creds(&u, &i->uid, NULL, NULL, NULL);
if (r < 0)
- log_error_errno(-r, "Failed to resolve user %s: %m", name);
+ log_error_errno(r, "Failed to resolve user %s: %m", name);
else
i->uid_valid = true;
}
r = get_group_creds(&g, &i->gid);
if (r < 0)
- log_error_errno(-r, "Failed to resolve group %s: %m", name);
+ log_error_errno(r, "Failed to resolve group %s: %m", name);
else
i->gid_valid = true;
}
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;
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);
}
}
- 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);
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);