Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/loginutils/chpasswd.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/loginutils/chpasswd.c (modified) (6 diffs)

branches/3.2/mindi-busybox/loginutils/chpasswd.c

@@ -7 +7 @@
  */
 #include "libbb.h"
+
+//usage:#define chpasswd_trivial_usage
+//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:    IF_LONG_OPTS(
+//usage:     "\n    -e,--encrypted  Supplied passwords are in encrypted form"
+//usage:     "\n    -m,--md5    Use MD5 encryption instead of DES"
+//usage:    )
+//usage:    IF_NOT_LONG_OPTS(
+//usage:     "\n    -e  Supplied passwords are in encrypted form"
+//usage:     "\n    -m  Use MD5 encryption instead of DES"
+//usage:    )
+
+//TODO: implement -c ALGO
 
 #if ENABLE_LONG_OPTS
@@ -21 +36 @@
 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);
 
@@ -34 +47 @@
 
     while ((name = xmalloc_fgetline(stdin)) != NULL) {
+        char *free_me;
+        char *pass;
+        int rc;
+
         pass = strchr(name, ':');
         if (!pass)
@@ -41 +58 @@
         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);
         }
 
@@ -54 +76 @@
 #if ENABLE_FEATURE_SHADOWPASSWDS
         rc = update_passwd(bb_path_shadow_file, name, pass, NULL);
-        if (rc == 0) /* no lines updated, no errors detected */
+        if (rc > 0) /* password in /etc/shadow was updated */
+            pass = (char*)"x";
+        if (rc >= 0)
+            /* 0 = /etc/shadow missing (not an error), >0 = passwd changed in /etc/shadow */
 #endif
             rc = update_passwd(bb_path_passwd_file, name, pass, NULL);
@@ -65 +90 @@
         logmode = LOGMODE_STDIO;
         free(name);
-        if (!(opt & OPT_ENC))
-            free(pass);
+        free(free_me);
     }
     return EXIT_SUCCESS;