From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 10 Apr 2015 12:44:52 +0000 (+0200)
Subject: tmpfiles: mostly revert 71044f609b829d802e0eb81270e13b4f55d76476
X-Git-Tag: v220~501
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ea40b781060f4fa429f77356f8baef4bdf3d4b5;p=thirdparty%2Fsystemd.git

tmpfiles: mostly revert 71044f609b829d802e0eb81270e13b4f55d76476

Add a comment why returning a positive error is OK and intended in this
case.

(It's still a nasty hack to do this though!)
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index ce4a10aa865..24a0d368428 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -734,10 +734,11 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif
 
         r = acl_set_file(path, type, dup);
         if (r < 0)
-                return log_error_errno(errno,
-                                       "Setting %s ACL \"%s\" on %s failed: %m",
-                                       type == ACL_TYPE_ACCESS ? "access" : "default",
-                                       strna(t), path);
+                /* Return positive to indicate we already warned */
+                return -log_error_errno(errno,
+                                        "Setting %s ACL \"%s\" on %s failed: %m",
+                                        type == ACL_TYPE_ACCESS ? "access" : "default",
+                                        strna(t), path);
 
         return 0;
 }