aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2020-11-29 11:32:48 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2020-11-29 11:32:48 +0100
commit87bd558f3f0452ed62f2686472e03a1be4a6e36d (patch)
tree46fb42606d1d8ba65211e5e2f4261830a01b8c00 /loginutils
parent32a8f70ac1caa4037b63747c0c0a5086953ea668 (diff)
downloadbusybox-87bd558f3f0452ed62f2686472e03a1be4a6e36d.tar.gz
busybox-87bd558f3f0452ed62f2686472e03a1be4a6e36d.tar.bz2
libbb: bb_do_delay(3) -> pause_after_failed_login(), and stop looping there
function old new delta pause_after_failed_login - 9 +9 vlock_main 358 353 -5 sulogin_main 252 247 -5 su_main 484 479 -5 passwd_main 936 931 -5 login_main 967 962 -5 bb_do_delay 68 - -68 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/5 up/down: 9/-93) Total: -84 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/login.c2
-rw-r--r--loginutils/passwd.c2
-rw-r--r--loginutils/su.c2
-rw-r--r--loginutils/sulogin.c2
-rw-r--r--loginutils/vlock.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/loginutils/login.c b/loginutils/login.c
index 3531d1424..c3a835180 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -505,7 +505,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
#endif /* ENABLE_PAM */
auth_failed:
opt &= ~LOGIN_OPT_f;
- bb_do_delay(LOGIN_FAIL_DELAY);
+ pause_after_failed_login();
/* TODO: doesn't sound like correct English phrase to me */
puts("Login incorrect");
if (++count == 3) {
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 6c643d3d0..770acf58a 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -57,7 +57,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo
encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
if (strcmp(encrypted, pw->pw_passwd) != 0) {
syslog(LOG_WARNING, "incorrect password for %s", pw->pw_name);
- bb_do_delay(LOGIN_FAIL_DELAY);
+ pause_after_failed_login();
puts("Incorrect password");
goto err_ret;
}
diff --git a/loginutils/su.c b/loginutils/su.c
index 7c1fc69c5..6f91039f9 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -146,7 +146,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
if (ENABLE_FEATURE_SU_SYSLOG)
syslog(LOG_NOTICE, "%c %s %s:%s",
'-', tty, old_user, opt_username);
- bb_do_delay(LOGIN_FAIL_DELAY);
+ pause_after_failed_login();
bb_simple_error_msg_and_die("incorrect password");
}
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 099085340..48dafd186 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -74,7 +74,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
if (r > 0) {
break;
}
- bb_do_delay(LOGIN_FAIL_DELAY);
+ pause_after_failed_login();
bb_simple_info_msg("Login incorrect");
}
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 9e319fe61..334b7d2ad 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -120,7 +120,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
if (ask_and_check_password(pw) > 0) {
break;
}
- bb_do_delay(LOGIN_FAIL_DELAY);
+ pause_after_failed_login();
puts("Incorrect password");
}