2 files changed, 6 insertions, 6 deletions
diff --git a/include/usage.h b/include/usage.h
index 1f9d5621d..ae6d2bcb6 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -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( \
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 25145fd1c..c83d1dad7 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -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 EXIT_SUCCESS;
-        return 0;
 }

diff --git a/include/usage.h b/include/usage.h index 1f9d5621d..ae6d2bcb6 100644 --- a/include/usage.h +++ b/include/usage.h
@@ -2924,13 +2924,13 @@
2924	"\n -u Unlock (re-enable) account" \	2924	"\n -u Unlock (re-enable) account" \
2925		2925
2926	#define chpasswd_trivial_usage \	2926	#define chpasswd_trivial_usage \
2927	USE_GETOPT_LONG("[--md5\|--encrypt]") SKIP_GETOPT_LONG("[-m\|-e]")	2927	USE_GETOPT_LONG("[--md5\|--encrypted]") SKIP_GETOPT_LONG("[-m\|-e]")
2928	#define chpasswd_full_usage "\n\n" \	2928	#define chpasswd_full_usage "\n\n" \
2929	"Read user:password information from stdin\n" \	2929	"Read user:password information from stdin " \
2930	"and update /etc/passwd accordingly.\n" \	2930	"and update /etc/passwd accordingly.\n" \
2931	"\nOptions:" \	2931	"\nOptions:" \
2932	USE_GETOPT_LONG( \	2932	USE_GETOPT_LONG( \
2933	"\n -e,--encrypt Supplied passwords are in encrypted form" \	2933	"\n -e,--encrypted Supplied passwords are in encrypted form" \
2934	"\n -m,--md5 Use MD5 encryption instead of DES" \	2934	"\n -m,--md5 Use MD5 encryption instead of DES" \
2935	) \	2935	) \
2936	SKIP_GETOPT_LONG( \	2936	SKIP_GETOPT_LONG( \


diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c index 25145fd1c..c83d1dad7 100644 --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c
@@ -65,8 +65,8 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
65	bb_info_msg("Password for '%s' changed", name);	65	bb_info_msg("Password for '%s' changed", name);
66	logmode = LOGMODE_STDIO;	66	logmode = LOGMODE_STDIO;
67	free(name);	67	free(name);
68	free(pass);	68	if (!(opt & OPT_ENC))
		69	free(pass);
69	}	70	}
70		71	return EXIT_SUCCESS;
71	return 0;
72	}	72	}