diff options
author | YmrDtnJu <YmrDtnJu@users.noreply.github.com> | 2019-02-01 11:38:35 +0100 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-02-02 12:46:32 +0100 |
commit | f2ea9cc746ce43959d627bf013719d069db81e32 (patch) | |
tree | 48917f922d046d470ee44e9aeaa286edfe5f7185 /src/shared/acl-util.c | |
parent | 19632f6dbb6697182c95f719055a883df7fb8569 (diff) | |
download | systemd-f2ea9cc746ce43959d627bf013719d069db81e32.tar.gz |
shared: Revert commit 49fe5c099 in parts for function parse_acl.
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.
Diffstat (limited to 'src/shared/acl-util.c')
-rw-r--r-- | src/shared/acl-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c index 6f0657174c..9633514513 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -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; } |