Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/loginutils/chpasswd.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

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

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

@@ -4 +4 @@
  *
  * Written for SLIND (from passwd.c) by Alexander Shishkin <virtuoso@slind.org>
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
-#if ENABLE_GETOPT_LONG
-#include <getopt.h>
-
+#if ENABLE_LONG_OPTS
 static const char chpasswd_longopts[] ALIGN1 =
     "encrypted\0" No_argument "e"
@@ -18 +15 @@
 #endif
 
-#define OPT_ENC     1
-#define OPT_MD5     2
+#define OPT_ENC  1
+#define OPT_MD5  2
 
-int chpasswd_main(int argc, char **argv);
-int chpasswd_main(int argc, char **argv)
+int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chpasswd_main(int argc UNUSED_PARAM, char **argv)
 {
     char *name, *pass;
@@ -33 +30 @@
 
     opt_complementary = "m--e:e--m";
-    USE_GETOPT_LONG(applet_long_options = chpasswd_longopts;)
+    IF_LONG_OPTS(applet_long_options = chpasswd_longopts;)
     opt = getopt32(argv, "em");
 
-    while ((name = xmalloc_getline(stdin)) != NULL) {
+    while ((name = xmalloc_fgetline(stdin)) != NULL) {
         pass = strchr(name, ':');
         if (!pass)
@@ -50 +47 @@
                 rnd = crypt_make_salt(salt + 3, 4, rnd);
             }
-            pass = pw_encrypt(pass, salt);
+            pass = pw_encrypt(pass, salt, 0);
         }
 
@@ -56 +53 @@
          * we try to find & change his passwd in /etc/passwd */
 #if ENABLE_FEATURE_SHADOWPASSWDS
-        rc = update_passwd(bb_path_shadow_file, name, pass);
+        rc = update_passwd(bb_path_shadow_file, name, pass, NULL);
         if (rc == 0) /* no lines updated, no errors detected */
 #endif
-            rc = update_passwd(bb_path_passwd_file, name, pass);
+            rc = update_passwd(bb_path_passwd_file, name, pass, NULL);
         /* LOGMODE_BOTH logs to syslog also */
         logmode = LOGMODE_BOTH;
@@ -68 +65 @@
         logmode = LOGMODE_STDIO;
         free(name);
+        if (!(opt & OPT_ENC))
+            free(pass);
     }
-
-    return 0;
+    return EXIT_SUCCESS;
 }