projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19632f6
)
shared: Revert commit 49fe5c099 in parts for function parse_acl.
author
YmrDtnJu
<YmrDtnJu@users.noreply.github.com>
Fri, 1 Feb 2019 10:38:35 +0000
(11:38 +0100)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Sat, 2 Feb 2019 11:46:32 +0000
(12:46 +0100)
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.
src/shared/acl-util.c
patch
|
blob
|
history
diff --git
a/src/shared/acl-util.c
b/src/shared/acl-util.c
index
6f06571
..
9633514
100644
(file)
--- 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;
}