daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 3d9f88326fefe4bf8f5ed4b1210c6b563a3eecff Mon Sep 17 00:00:00 2001
803fb7
From: Martin Pitt <martin.pitt@ubuntu.com>
803fb7
Date: Tue, 17 Feb 2015 12:47:51 +0100
803fb7
Subject: [PATCH] tmpfiles: Fix parse_acl error message
803fb7
803fb7
parse_acl() returns the error instead of setting errno.
803fb7
803fb7
(cherry picked from commit 484adfd914504cd7e95867cea20ca7af71b888f2)
803fb7
---
803fb7
 src/tmpfiles/tmpfiles.c | 2 +-
803fb7
 1 file changed, 1 insertion(+), 1 deletion(-)
803fb7
803fb7
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
803fb7
index c948d4d21..88ba7e46a 100644
803fb7
--- a/src/tmpfiles/tmpfiles.c
803fb7
+++ b/src/tmpfiles/tmpfiles.c
803fb7
@@ -689,7 +689,7 @@ static int get_acls_from_arg(Item *item) {
803fb7
          * afterwards, so the mask can be added now if necessary. */
803fb7
         r = parse_acl(item->argument, &item->acl_access, &item->acl_default, !item->force);
803fb7
         if (r < 0)
803fb7
-                log_warning_errno(errno, "Failed to parse ACL \"%s\": %m. Ignoring",
803fb7
+                log_warning_errno(r, "Failed to parse ACL \"%s\": %m. Ignoring",
803fb7
                                   item->argument);
803fb7
 #else
803fb7
         log_warning_errno(ENOSYS, "ACLs are not supported. Ignoring");