X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsysusers%2Fsysusers.c;h=88111029060af27df99839122f27d8523efb05de;hb=23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41;hp=04e973ac17bf784520257ec7b51c3bc0304fc9c4;hpb=fff19499605924251d037073f47665419b669400;p=elogind.git

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 04e973ac1..881110290 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -67,15 +67,7 @@ typedef struct Item {
 
 static char *arg_root = NULL;
 
-static const char conf_file_dirs[] =
-        "/etc/sysusers.d\0"
-        "/run/sysusers.d\0"
-        "/usr/local/lib/sysusers.d\0"
-        "/usr/lib/sysusers.d\0"
-#ifdef HAVE_SPLIT_USR
-        "/lib/sysusers.d\0"
-#endif
-        ;
+static const char conf_file_dirs[] = CONF_DIRS_NULSTR("sysusers");
 
 static Hashmap *users = NULL, *groups = NULL;
 static Hashmap *todo_uids = NULL, *todo_gids = NULL;
@@ -928,7 +920,7 @@ static int add_user(Item *i) {
         if (i->uid_set) {
                 r = uid_is_ok(i->uid, i->name);
                 if (r < 0) {
-                        log_error("Failed to verify uid " UID_FMT ": %s", i->uid, strerror(-r));
+                        log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
                         return r;
                 }
                 if (r == 0) {
@@ -948,7 +940,7 @@ static int add_user(Item *i) {
                         else {
                                 r = uid_is_ok(c, i->name);
                                 if (r < 0) {
-                                        log_error("Failed to verify uid " UID_FMT ": %s", i->uid, strerror(-r));
+                                        log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
                                         return r;
                                 } else if (r > 0) {
                                         i->uid = c;
@@ -963,7 +955,7 @@ static int add_user(Item *i) {
         if (!i->uid_set && i->gid_set) {
                 r = uid_is_ok((uid_t) i->gid, i->name);
                 if (r < 0) {
-                        log_error("Failed to verify uid " UID_FMT ": %s", i->uid, strerror(-r));
+                        log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
                         return r;
                 }
                 if (r > 0) {
@@ -983,7 +975,7 @@ static int add_user(Item *i) {
 
                         r = uid_is_ok(search_uid, i->name);
                         if (r < 0) {
-                                log_error("Failed to verify uid " UID_FMT ": %s", i->uid, strerror(-r));
+                                log_error_errno(r, "Failed to verify uid " UID_FMT ": %m", i->uid);
                                 return r;
                         } else if (r > 0)
                                 break;
@@ -1080,7 +1072,7 @@ static int add_group(Item *i) {
         if (i->gid_set) {
                 r = gid_is_ok(i->gid);
                 if (r < 0) {
-                        log_error("Failed to verify gid " GID_FMT ": %s", i->gid, strerror(-r));
+                        log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
                         return r;
                 }
                 if (r == 0) {
@@ -1093,7 +1085,7 @@ static int add_group(Item *i) {
         if (!i->gid_set && i->uid_set) {
                 r = gid_is_ok((gid_t) i->uid);
                 if (r < 0) {
-                        log_error("Failed to verify gid " GID_FMT ": %s", i->gid, strerror(-r));
+                        log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
                         return r;
                 }
                 if (r > 0) {
@@ -1113,7 +1105,7 @@ static int add_group(Item *i) {
                         else {
                                 r = gid_is_ok(c);
                                 if (r < 0) {
-                                        log_error("Failed to verify gid " GID_FMT ": %s", i->gid, strerror(-r));
+                                        log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
                                         return r;
                                 } else if (r > 0) {
                                         i->gid = c;
@@ -1136,7 +1128,7 @@ static int add_group(Item *i) {
 
                         r = gid_is_ok(search_uid);
                         if (r < 0) {
-                                log_error("Failed to verify gid " GID_FMT ": %s", i->gid, strerror(-r));
+                                log_error_errno(r, "Failed to verify gid " GID_FMT ": %m", i->gid);
                                 return r;
                         } else if (r > 0)
                                 break;
@@ -1729,7 +1721,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
                         if (ignore_enoent && r == -ENOENT)
                                 return 0;
 
-                        log_error("Failed to open '%s', ignoring: %s", fn, strerror(-r));
+                        log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
                         return r;
                 }
 
@@ -1861,7 +1853,7 @@ int main(int argc, char *argv[]) {
 
         r = mac_selinux_init(NULL);
         if (r < 0) {
-                log_error("SELinux setup failed: %s", strerror(-r));
+                log_error_errno(r, "SELinux setup failed: %m");
                 goto finish;
         }
 
@@ -1879,7 +1871,7 @@ int main(int argc, char *argv[]) {
 
                 r = conf_files_list_nulstr(&files, ".conf", arg_root, conf_file_dirs);
                 if (r < 0) {
-                        log_error("Failed to enumerate sysusers.d files: %s", strerror(-r));
+                        log_error_errno(r, "Failed to enumerate sysusers.d files: %m");
                         goto finish;
                 }
 
@@ -1905,19 +1897,19 @@ int main(int argc, char *argv[]) {
 
         lock = take_password_lock(arg_root);
         if (lock < 0) {
-                log_error("Failed to take lock: %s", strerror(-lock));
+                log_error_errno(lock, "Failed to take lock: %m");
                 goto finish;
         }
 
         r = load_user_database();
         if (r < 0) {
-                log_error("Failed to load user database: %s", strerror(-r));
+                log_error_errno(r, "Failed to load user database: %m");
                 goto finish;
         }
 
         r = load_group_database();
         if (r < 0) {
-                log_error("Failed to read group database: %s", strerror(-r));
+                log_error_errno(r, "Failed to read group database: %m");
                 goto finish;
         }
 
@@ -1929,7 +1921,7 @@ int main(int argc, char *argv[]) {
 
         r = write_files();
         if (r < 0)
-                log_error("Failed to write files: %s", strerror(-r));
+                log_error_errno(r, "Failed to write files: %m");
 
 finish:
         while ((i = hashmap_steal_first(groups)))