Skip to content

Commit

Permalink
shared: Revert commit 49fe5c0 in parts for function parse_acl.
Browse files Browse the repository at this point in the history
Too much code has been removed while replacing startswith with STARTSWITH_SET
so that every ACL specified e.g. in tmpfiles.d was parsed as a default ACL.

(cherry picked from commit f2ea9cc)
  • Loading branch information
YmrDtnJu authored and keszybz committed Feb 7, 2019
1 parent 04f173d commit 5b34373
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/shared/acl-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,10 @@ int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want
char *p;

p = STARTSWITH_SET(*entry, "default:", "d:");
if (!p)
p = *entry;

r = strv_push(&d, p);
if (p)
r = strv_push(&d, p);
else
r = strv_push(&a, *entry);
if (r < 0)
return r;
}
Expand Down

0 comments on commit 5b34373

Please sign in to comment.