machinectl: issue all bus commands while allowing interactive auth

[elogind.git] / src / tmpfiles / tmpfiles.c

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 443851a8aa8b48975f3c30cd1bd46e747288dfc1..88ba7e46a28139b4fd6e5da5a262ca80b7ad2241 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -630,7 +630,7 @@ static int get_xattrs_from_arg(Item *i) {
 
         while ((r = unquote_first_word(&p, &xattr, false)) > 0) {
                 _cleanup_free_ char *tmp = NULL, *name = NULL,
-                        *value = NULL, *value2 = NULL;
+                        *value = NULL, *value2 = NULL, *_xattr = xattr;
 
                 r = split_pair(xattr, "=", &name, &value);
                 if (r < 0) {
@@ -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");
@@ -698,6 +698,7 @@ static int get_acls_from_arg(Item *item) {
         return 0;
 }
 
+#ifdef HAVE_ACL
 static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modify) {
         _cleanup_(acl_freep) acl_t dup = NULL;
         int r;
@@ -736,6 +737,7 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif
                                        strna(t), path);
         return 0;
 }
+#endif
 
 static int path_set_acls(Item *item, const char *path) {
 #ifdef HAVE_ACL