diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-20 19:47:49 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-20 19:47:49 +0100 |
commit | 9731ca7611e19827702eb8c690fb6c3b37403319 (patch) | |
tree | 703d8fbaf75e872fca83ca1e57e830eaeff1aace /loginutils/chpasswd.c | |
parent | 38972a8df1df970a5878bbd7fc5ef6259f1168ab (diff) | |
download | busybox-w32-9731ca7611e19827702eb8c690fb6c3b37403319.tar.gz busybox-w32-9731ca7611e19827702eb8c690fb6c3b37403319.tar.bz2 busybox-w32-9731ca7611e19827702eb8c690fb6c3b37403319.zip |
password utils: improve --help, make DEFAULT_PASSWD_ALGO visible if CHPASSWD
Was:
$ cryptpw --help
...
Print crypt(3) hashed PASSWORD
-P,--password-fd=N Read password from fd N
-m,--method=TYPE Encryption method
-S,--salt=SALT
User: "What methods exist? which one os default?"
Now:
Print crypt(3) hashed PASSWORD
-P,--password-fd N Read password from fd N
-m,--method TYPE des,md5,sha256/512 (default des)
-S,--salt SALT
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils/chpasswd.c')
-rw-r--r-- | loginutils/chpasswd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c index 2d268be67..baafd35c8 100644 --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c | |||
@@ -13,9 +13,9 @@ | |||
13 | //config: and uses this information to update a group of existing users. | 13 | //config: and uses this information to update a group of existing users. |
14 | //config: | 14 | //config: |
15 | //config:config FEATURE_DEFAULT_PASSWD_ALGO | 15 | //config:config FEATURE_DEFAULT_PASSWD_ALGO |
16 | //config: string "Default password encryption method (passwd -a, cryptpw -m parameter)" | 16 | //config: string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)" |
17 | //config: default "des" | 17 | //config: default "des" |
18 | //config: depends on PASSWD || CRYPTPW | 18 | //config: depends on PASSWD || CRYPTPW || CHPASSWD |
19 | //config: help | 19 | //config: help |
20 | //config: Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". | 20 | //config: Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". |
21 | 21 | ||
@@ -29,13 +29,13 @@ | |||
29 | //usage: "Read user:password from stdin and update /etc/passwd\n" | 29 | //usage: "Read user:password from stdin and update /etc/passwd\n" |
30 | //usage: IF_LONG_OPTS( | 30 | //usage: IF_LONG_OPTS( |
31 | //usage: "\n -e,--encrypted Supplied passwords are in encrypted form" | 31 | //usage: "\n -e,--encrypted Supplied passwords are in encrypted form" |
32 | //usage: "\n -m,--md5 Use MD5 encryption instead of DES" | 32 | //usage: "\n -m,--md5 Eencrypt using md5, not des" |
33 | //usage: "\n -c,--crypt-method Use the specified method to encrypt the passwords" | 33 | //usage: "\n -c,--crypt-method ALG "CRYPT_METHODS_HELP_STR |
34 | //usage: ) | 34 | //usage: ) |
35 | //usage: IF_NOT_LONG_OPTS( | 35 | //usage: IF_NOT_LONG_OPTS( |
36 | //usage: "\n -e Supplied passwords are in encrypted form" | 36 | //usage: "\n -e Supplied passwords are in encrypted form" |
37 | //usage: "\n -m Use MD5 encryption instead of DES" | 37 | //usage: "\n -m Eencrypt using md5, not des" |
38 | //usage: "\n -c Use the specified method to encrypt the passwords" | 38 | //usage: "\n -c ALG "CRYPT_METHODS_HELP_STR |
39 | //usage: ) | 39 | //usage: ) |
40 | 40 | ||
41 | #include "libbb.h" | 41 | #include "libbb.h" |