]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sysusers: improve error reporting 1359/head
authorJan Engelhardt <jengelh@inai.de>
Wed, 23 Sep 2015 14:55:38 +0000 (16:55 +0200)
committerJan Engelhardt <jengelh@inai.de>
Thu, 24 Sep 2015 14:20:01 +0000 (16:20 +0200)
Creating group input with gid 491.
Failed to write files: File exists

"Why is the presence of /etc/group a problem?"

src/sysusers/sysusers.c

index aaa33354f490ce0f0021cb8a98b4940f775b5c8d..c40f833788eb1f2b37f470bc8c61065c648091f5 100644 (file)
@@ -392,11 +392,13 @@ static int write_files(void) {
 
                                 i = hashmap_get(groups, gr->gr_name);
                                 if (i && i->todo_group) {
+                                        log_error("%s: Group \"%s\" already exists.", group_path, gr->gr_name);
                                         r = -EEXIST;
                                         goto finish;
                                 }
 
                                 if (hashmap_contains(todo_gids, GID_TO_PTR(gr->gr_gid))) {
+                                        log_error("%s: Detected collision for GID %d.", group_path, gr->gr_gid);
                                         r = -EEXIST;
                                         goto finish;
                                 }
@@ -464,6 +466,7 @@ static int write_files(void) {
 
                                 i = hashmap_get(groups, sg->sg_namp);
                                 if (i && i->todo_group) {
+                                        log_error("%s: Group \"%s\" already exists.", gshadow_path, sg->sg_namp);
                                         r = -EEXIST;
                                         goto finish;
                                 }
@@ -530,11 +533,13 @@ static int write_files(void) {
 
                                 i = hashmap_get(users, pw->pw_name);
                                 if (i && i->todo_user) {
+                                        log_error("%s: User \"%s\" already exists.", passwd_path, pw->pw_name);
                                         r = -EEXIST;
                                         goto finish;
                                 }
 
                                 if (hashmap_contains(todo_uids, UID_TO_PTR(pw->pw_uid))) {
+                                        log_error("%s: Detected collision for UID %d.", passwd_path, pw->pw_uid);
                                         r = -EEXIST;
                                         goto finish;
                                 }