chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
32c3d71
)
tmpfiles: Fix parse_acl error message
author
Martin Pitt
<martin.pitt@ubuntu.com>
Tue, 17 Feb 2015 11:47:51 +0000
(12:47 +0100)
committer
Martin Pitt
<martin.pitt@ubuntu.com>
Tue, 17 Feb 2015 11:47:51 +0000
(12:47 +0100)
parse_acl() returns the error instead of setting errno.
src/tmpfiles/tmpfiles.c
patch
|
blob
|
history
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index c948d4d218b7cd42ac2d6125f2da3c010c892d46..88ba7e46a28139b4fd6e5da5a262ca80b7ad2241 100644
(file)
--- a/
src/tmpfiles/tmpfiles.c
+++ b/
src/tmpfiles/tmpfiles.c
@@
-689,7
+689,7
@@
static int get_acls_from_arg(Item *item) {
* afterwards, so the mask can be added now if necessary. */
r = parse_acl(item->argument, &item->acl_access, &item->acl_default, !item->force);
if (r < 0)
- log_warning_errno(
errno
, "Failed to parse ACL \"%s\": %m. Ignoring",
+ log_warning_errno(
r
, "Failed to parse ACL \"%s\": %m. Ignoring",
item->argument);
#else
log_warning_errno(ENOSYS, "ACLs are not supported. Ignoring");