26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
|
From ea960d3fc09c1e3745791d3433094678fd7ccd50 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Martin Pitt <martin.pitt@ubuntu.com>
|
||
|
|
Date: Tue, 17 Feb 2015 12:47:51 +0100
|
||
|
|
Subject: [PATCH] tmpfiles: Fix parse_acl error message
|
||
|
|
|
||
|
|
parse_acl() returns the error instead of setting errno.
|
||
|
|
|
||
|
|
(cherry picked from commit 484adfd914504cd7e95867cea20ca7af71b888f2)
|
||
|
|
---
|
||
|
|
src/tmpfiles/tmpfiles.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
|
||
|
|
index c948d4d218..88ba7e46a2 100644
|
||
|
|
--- 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");
|