adduser: don't bomb out if shadow password file doesn't exist

(from Tito <farmatito@tiscali.it>)

diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 4c03790d8b7d9c3e4cace102f567862a1e0fdc53..124e177302868e71c7cea6805a64b44f1c5787c3 100644 (file)
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -109,19 +109,23 @@ static int adduser(struct passwd *p)
        if (putpwent(p, file) == -1) {
                bb_perror_nomsg_and_die();
        }
-       fclose(file);
+       if (ENABLE_FEATURE_CLEAN_UP)
+               fclose(file);
 
 #if ENABLE_FEATURE_SHADOWPASSWDS
        /* add to shadow if necessary */
-       file = xfopen(bb_path_shadow_file, "a");
-       fseek(file, 0, SEEK_END);
-       fprintf(file, "%s:!:%ld:%d:%d:%d:::\n",
-                       p->pw_name,             /* username */
-                       time(NULL) / 86400,     /* sp->sp_lstchg */
-                       0,                      /* sp->sp_min */
-                       99999,                  /* sp->sp_max */
-                       7);                     /* sp->sp_warn */
-       fclose(file);
+       file = fopen_or_warn(bb_path_shadow_file, "a");
+       if (file) {
+               fseek(file, 0, SEEK_END);
+               fprintf(file, "%s:!:%ld:%d:%d:%d:::\n",
+                               p->pw_name,             /* username */
+                               time(NULL) / 86400,     /* sp->sp_lstchg */
+                               0,                      /* sp->sp_min */
+                               99999,                  /* sp->sp_max */
+                               7);                     /* sp->sp_warn */
+               if (ENABLE_FEATURE_CLEAN_UP)
+                       fclose(file);
+       }
 #endif
 
        /* add to group */