#include "libbb.h"
#if ENABLE_GETOPT_LONG
-#include <getopt.h>
-
static const char chpasswd_longopts[] ALIGN1 =
"encrypted\0" No_argument "e"
"md5\0" No_argument "m"
#define OPT_MD5 2
int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chpasswd_main(int argc, char **argv)
+int chpasswd_main(int argc UNUSED_PARAM, char **argv)
{
char *name, *pass;
char salt[sizeof("$N$XXXXXXXX")];
USE_GETOPT_LONG(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)
bb_error_msg_and_die("missing new password");
strcpy(salt, "$1$");
rnd = crypt_make_salt(salt + 3, 4, rnd);
}
- pass = pw_encrypt(pass, salt);
+ pass = pw_encrypt(pass, salt, 0);
}
/* This is rather complex: if user is not found in /etc/shadow,
bb_info_msg("Password for '%s' changed", name);
logmode = LOGMODE_STDIO;
free(name);
+ if (!(opt & OPT_ENC))
+ free(pass);
}
-
- return 0;
+ return EXIT_SUCCESS;
}