import: add support for gpg2 for verifying imported images

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

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 96b1fb4d3f338da40bb0d55d122440cedc8369c8..2642934147aaa89699e6d7fb8d2425d398c3f970 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <limits.h>
 #include <dirent.h>
-#include <grp.h>
-#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -37,8 +35,6 @@
 #include <glob.h>
 #include <fnmatch.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/param.h>
 #include <sys/xattr.h>
 
 #include "log.h"
@@ -689,7 +685,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 +694,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 +733,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