diff options
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)) { |