BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- don't free user-supplied string (via -e) 

- fix helptext
(r23046 from trunk)
1_11_stable
Bernhard Reutner-Fischer 2008-08-05 14:33:37 +00:00
parent f2b846e277
commit a4d0cd0a31
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/usage.h
View File

@ -2916,13 +2916,13 @@
"\n -u Unlock (re-enable) account" \
#define chpasswd_trivial_usage \
USE_GETOPT_LONG("[--md5|--encrypt]") SKIP_GETOPT_LONG("[-m|-e]")
USE_GETOPT_LONG("[--md5|--encrypted]") SKIP_GETOPT_LONG("[-m|-e]")
#define chpasswd_full_usage "\n\n" \
"Read user:password information from stdin\n" \
"Read user:password information from stdin " \
"and update /etc/passwd accordingly.\n" \
"\nOptions:" \
USE_GETOPT_LONG( \
"\n -e,--encrypt Supplied passwords are in encrypted form" \
"\n -e,--encrypted Supplied passwords are in encrypted form" \
"\n -m,--md5 Use MD5 encryption instead of DES" \
) \
SKIP_GETOPT_LONG( \

6
loginutils/chpasswd.c
View File

@ -65,8 +65,8 @@ int chpasswd_main(int argc ATTRIBUTE_UNUSED, char **argv)
bb_info_msg("Password for '%s' changed", name);
logmode = LOGMODE_STDIO;
free(name);
free(pass);
if (!(opt & OPT_ENC))
free(pass);
}
return 0;
return EXIT_SUCCESS;
}