summaryrefslogtreecommitdiff
path: root/src/shared/acl-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-23 16:30:23 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-26 14:08:46 +0100
commit49fe5c099639aa2111efb56c6ac609955a279279 (patch)
treebff451fbe68b0aa57fe8ad198695384eab264545 /src/shared/acl-util.c
parent52f1552073047195d51901f7e5a5a4fa3189034e (diff)
downloadsystemd-49fe5c099639aa2111efb56c6ac609955a279279.tar.gz
tree-wide: port various places over to STARTSWITH_SET()
Diffstat (limited to 'src/shared/acl-util.c')
-rw-r--r--src/shared/acl-util.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 1eaf653103..6f0657174c 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -219,14 +219,11 @@ int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want
STRV_FOREACH(entry, split) {
char *p;
- p = startswith(*entry, "default:");
+ p = STARTSWITH_SET(*entry, "default:", "d:");
if (!p)
- p = startswith(*entry, "d:");
+ p = *entry;
- if (p)
- r = strv_push(&d, p);
- else
- r = strv_push(&a, *entry);
+ r = strv_push(&d, p);
if (r < 0)
return r;
}