diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-04-13 13:04:05 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-04-13 13:04:05 +0200 |
commit | a3de0b3b86deb37c2adc993c6357c1a31b7ecb5b (patch) | |
tree | 19aa5e71448b03b2aea9aa2cad42a9a5d9066dc1 /loginutils | |
parent | 335681ca8e39144fa19814f7ba10d0fe760e4055 (diff) | |
download | busybox-w32-a3de0b3b86deb37c2adc993c6357c1a31b7ecb5b.tar.gz busybox-w32-a3de0b3b86deb37c2adc993c6357c1a31b7ecb5b.tar.bz2 busybox-w32-a3de0b3b86deb37c2adc993c6357c1a31b7ecb5b.zip |
libbb: make check_password() also return CHECKPASS_PW_HAS_EMPTY_PASSWORD
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
-rw-r--r-- | loginutils/login.c | 2 | ||||
-rw-r--r-- | loginutils/su.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/loginutils/login.c b/loginutils/login.c index 661a87448..be05def09 100644 --- a/loginutils/login.c +++ b/loginutils/login.c | |||
@@ -486,7 +486,7 @@ int login_main(int argc UNUSED_PARAM, char **argv) | |||
486 | if (opt & LOGIN_OPT_f) | 486 | if (opt & LOGIN_OPT_f) |
487 | break; /* -f USER: success without asking passwd */ | 487 | break; /* -f USER: success without asking passwd */ |
488 | 488 | ||
489 | if (pw->pw_uid == 0 && !check_securetty(short_tty)) | 489 | if (pw->pw_uid == 0 && !is_tty_secure(short_tty)) |
490 | goto auth_failed; | 490 | goto auth_failed; |
491 | 491 | ||
492 | /* Don't check the password if password entry is empty (!) */ | 492 | /* Don't check the password if password entry is empty (!) */ |
diff --git a/loginutils/su.c b/loginutils/su.c index f2cd799ae..ef74aa77d 100644 --- a/loginutils/su.c +++ b/loginutils/su.c | |||
@@ -134,7 +134,7 @@ int su_main(int argc UNUSED_PARAM, char **argv) | |||
134 | if (r > 0) { | 134 | if (r > 0) { |
135 | if (ENABLE_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY | 135 | if (ENABLE_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY |
136 | && r == CHECKPASS_PW_HAS_EMPTY_PASSWORD | 136 | && r == CHECKPASS_PW_HAS_EMPTY_PASSWORD |
137 | && !check_securetty(tty) | 137 | && !is_tty_secure(tty) |
138 | ) { | 138 | ) { |
139 | goto fail; | 139 | goto fail; |
140 | } | 140 | } |