From 7d4e7a27aface177b6f6120132cdd6fd7fd371f9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 8 Mar 2011 21:07:05 +0100 Subject: [PATCH] s/FAIL_DELAY/LOGIN_FAIL_DELAY/ Signed-off-by: Denys Vlasenko --- loginutils/login.c | 2 +- loginutils/passwd.c | 2 +- loginutils/sulogin.c | 4 ++-- loginutils/vlock.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/loginutils/login.c b/loginutils/login.c index 028a099b6..5eeb0826d 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -355,7 +355,7 @@ int login_main(int argc UNUSED_PARAM, char **argv) #endif /* ENABLE_PAM */ auth_failed: opt &= ~LOGIN_OPT_f; - bb_do_delay(FAIL_DELAY); + bb_do_delay(LOGIN_FAIL_DELAY); /* 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 728e61867..f3928cecc 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c @@ -28,7 +28,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo) if (strcmp(encrypted, pw->pw_passwd) != 0) { syslog(LOG_WARNING, "incorrect password for %s", pw->pw_name); - bb_do_delay(FAIL_DELAY); + bb_do_delay(LOGIN_FAIL_DELAY); puts("Incorrect password"); goto err_ret; } diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index 307536721..0e5b59433 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c @@ -88,8 +88,8 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv) if (r == 0) { break; } - bb_do_delay(FAIL_DELAY); - bb_error_msg("login incorrect"); + bb_do_delay(LOGIN_FAIL_DELAY); + bb_info_msg("Login incorrect"); } memset(cp, 0, strlen(cp)); // signal(SIGALRM, SIG_DFL); diff --git a/loginutils/vlock.c b/loginutils/vlock.c index 0d0f3bca2..3299afa50 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c @@ -101,8 +101,8 @@ int vlock_main(int argc UNUSED_PARAM, char **argv) if (correct_password(pw)) { break; } - bb_do_delay(FAIL_DELAY); - puts("Password incorrect"); + bb_do_delay(LOGIN_FAIL_DELAY); + puts("Incorrect password"); } #ifdef __linux__