From: YmrDtnJu <YmrDtnJu@users.noreply.github.com>
Date: Fri, 1 Feb 2019 10:38:35 +0000 (+0100)
Subject: shared: Revert commit 49fe5c099 in parts for function parse_acl.
X-Git-Tag: v241~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2ea9cc746ce43959d627bf013719d069db81e32;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 6f0657174cb..96335145138 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;
         }