udhcpc: fix a problem with binary-encoded options #2

[oweals/busybox.git] / loginutils / chpasswd.c

diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 6c4296faa0ff916e48bbe59a9b1adf1f7f6a6ec8..54ed73795a464bcc293bef310e611eb21df0a4ff 100644 (file)
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -11,7 +11,6 @@
 //usage:       IF_LONG_OPTS("[--md5|--encrypted]") IF_NOT_LONG_OPTS("[-m|-e]")
 //usage:#define chpasswd_full_usage "\n\n"
 //usage:       "Read user:password from stdin and update /etc/passwd\n"
-//usage:     "\nOptions:"
 //usage:       IF_LONG_OPTS(
 //usage:     "\n       -e,--encrypted  Supplied passwords are in encrypted form"
 //usage:     "\n       -m,--md5        Use MD5 encryption instead of DES"
@@ -21,6 +20,8 @@
 //usage:     "\n       -m      Use MD5 encryption instead of DES"
 //usage:       )
 
+//TODO: implement -c ALGO
+
 #if ENABLE_LONG_OPTS
 static const char chpasswd_longopts[] ALIGN1 =
        "encrypted\0" No_argument "e"
@@ -34,12 +35,10 @@ static const char chpasswd_longopts[] ALIGN1 =
 int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int chpasswd_main(int argc UNUSED_PARAM, char **argv)
 {
-       char *name, *pass;
-       char salt[sizeof("$N$XXXXXXXX")];
-       int opt, rc;
-       int rnd = rnd; /* we *want* it to be non-initialized! */
+       char *name;
+       int opt;
 
-       if (getuid())
+       if (getuid() != 0)
                bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
        opt_complementary = "m--e:e--m";
@@ -47,6 +46,10 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
        opt = getopt32(argv, "em");
 
        while ((name = xmalloc_fgetline(stdin)) != NULL) {
+               char *free_me;
+               char *pass;
+               int rc;
+
                pass = strchr(name, ':');
                if (!pass)
                        bb_error_msg_and_die("missing new password");
@@ -54,13 +57,18 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
 
                xuname2uid(name); /* dies if there is no such user */
 
+               free_me = NULL;
                if (!(opt & OPT_ENC)) {
-                       rnd = crypt_make_salt(salt, 1, rnd);
+                       char salt[sizeof("$N$XXXXXXXX")];
+
+                       crypt_make_salt(salt, 1);
                        if (opt & OPT_MD5) {
-                               strcpy(salt, "$1$");
-                               rnd = crypt_make_salt(salt + 3, 4, rnd);
+                               salt[0] = '$';
+                               salt[1] = '1';
+                               salt[2] = '$';
+                               crypt_make_salt(salt + 3, 4);
                        }
-                       pass = pw_encrypt(pass, salt, 0);
+                       free_me = pass = pw_encrypt(pass, salt, 0);
                }
 
                /* This is rather complex: if user is not found in /etc/shadow,
@@ -81,8 +89,7 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
                        bb_info_msg("Password for '%s' changed", name);
                logmode = LOGMODE_STDIO;
                free(name);
-               if (!(opt & OPT_ENC))
-                       free(pass);
+               free(free_me);
        }
        return EXIT_SUCCESS;
 }