[systemd-commits] src/tmpfiles

Martin Pitt martin at kemper.freedesktop.org
Tue Feb 17 03:48:22 PST 2015


 src/tmpfiles/tmpfiles.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 484adfd914504cd7e95867cea20ca7af71b888f2
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Feb 17 12:47:51 2015 +0100

    tmpfiles: Fix parse_acl error message
    
    parse_acl() returns the error instead of setting errno.

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index c948d4d..88ba7e4 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");



More information about the systemd-commits mailing list