← Commit list

9b4461320

Bernhard Reutner-Fischer
Bernhard Reutner-Fischer
2008-08-05
FAILED Duration: 23s

Subject

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

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

include/usage.h +3 -3loginutils/chpasswd.c +3 -3
include/usage.h+3 -3
@@ -2924,13 +2924,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( \
loginutils/chpasswd.c+3 -3
@@ -65,8 +65,8 @@ int chpasswd_main(int argc UNUSED_PARAM, 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;
}