diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-12-03 18:48:39 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-12-03 18:48:39 +0000 |
| commit | 82b142996625d6bf20ee667ce602496cb270fccc (patch) | |
| tree | df4be1e1502cdbe3f49bf46c7bd00db764add571 /loginutils/passwd.c | |
| parent | 81c3a1d0b2be02c1d675e6dceb500ce6b3da3282 (diff) | |
| download | busybox-w32-82b142996625d6bf20ee667ce602496cb270fccc.tar.gz busybox-w32-82b142996625d6bf20ee667ce602496cb270fccc.tar.bz2 busybox-w32-82b142996625d6bf20ee667ce602496cb270fccc.zip | |
- add new applet mkpasswd(1)
function old new delta
bb_ask - 355 +355
mkpasswd_main - 296 +296
.rodata 121746 121847 +101
packed_usage 24632 24689 +57
static.methods - 21 +21
gmatch 229 248 +19
bb_ask_stdin - 11 +11
applet_names 1949 1958 +9
applet_main 1172 1176 +4
sulogin_main 503 505 +2
applet_nameofs 586 588 +2
sha256_hash 329 327 -2
correct_password 208 206 -2
parse_command 1442 1439 -3
get_cred_or_die 145 141 -4
passwd_main 1054 1044 -10
bb_askpass 348 - -348
------------------------------------------------------------------------------
(add/remove: 4/1 grow/shrink: 7/5 up/down: 877/-369) Total: 508 bytes
Diffstat (limited to 'loginutils/passwd.c')
| -rw-r--r-- | loginutils/passwd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/loginutils/passwd.c b/loginutils/passwd.c index b156ab5af..e3e74bae7 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c | |||
| @@ -22,7 +22,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo) | |||
| 22 | if (myuid && pw->pw_passwd[0]) { | 22 | if (myuid && pw->pw_passwd[0]) { |
| 23 | char *encrypted; | 23 | char *encrypted; |
| 24 | 24 | ||
| 25 | orig = bb_askpass(0, "Old password:"); /* returns ptr to static */ | 25 | orig = bb_ask_stdin("Old password:"); /* returns ptr to static */ |
| 26 | if (!orig) | 26 | if (!orig) |
| 27 | goto err_ret; | 27 | goto err_ret; |
| 28 | encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */ | 28 | encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */ |
| @@ -35,16 +35,16 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo) | |||
| 35 | } | 35 | } |
| 36 | if (ENABLE_FEATURE_CLEAN_UP) free(encrypted); | 36 | if (ENABLE_FEATURE_CLEAN_UP) free(encrypted); |
| 37 | } | 37 | } |
| 38 | orig = xstrdup(orig); /* or else bb_askpass() will destroy it */ | 38 | orig = xstrdup(orig); /* or else bb_ask_stdin() will destroy it */ |
| 39 | newp = bb_askpass(0, "New password:"); /* returns ptr to static */ | 39 | newp = bb_ask_stdin("New password:"); /* returns ptr to static */ |
| 40 | if (!newp) | 40 | if (!newp) |
| 41 | goto err_ret; | 41 | goto err_ret; |
| 42 | newp = xstrdup(newp); /* we are going to bb_askpass() again, so save it */ | 42 | newp = xstrdup(newp); /* we are going to bb_ask_stdin() again, so save it */ |
| 43 | if (ENABLE_FEATURE_PASSWD_WEAK_CHECK | 43 | if (ENABLE_FEATURE_PASSWD_WEAK_CHECK |
| 44 | && obscure(orig, newp, pw) && myuid) | 44 | && obscure(orig, newp, pw) && myuid) |
| 45 | goto err_ret; /* non-root is not allowed to have weak passwd */ | 45 | goto err_ret; /* non-root is not allowed to have weak passwd */ |
| 46 | 46 | ||
| 47 | cp = bb_askpass(0, "Retype password:"); | 47 | cp = bb_ask_stdin("Retype password:"); |
| 48 | if (!cp) | 48 | if (!cp) |
| 49 | goto err_ret; | 49 | goto err_ret; |
| 50 | if (strcmp(cp, newp)) { | 50 | if (strcmp(cp, newp)) { |