s/FAIL_DELAY/LOGIN_FAIL_DELAY/
authorDenys Vlasenko <vda.linux@googlemail.com>
Tue, 8 Mar 2011 20:07:05 +0000 (21:07 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Tue, 8 Mar 2011 20:07:05 +0000 (21:07 +0100)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
loginutils/login.c
loginutils/passwd.c
loginutils/sulogin.c
loginutils/vlock.c

index 028a099b6556478338d9a05ab90c406a9de86b9a..5eeb0826dba0bd7a6ea2282bb47594fe5e966ed6 100644 (file)
@@ -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) {
index 728e6186760ee5e997d1bbd7920aaf682f6b6473..f3928cecc64b64ff2a6d72adf6990be99ceef2a4 100644 (file)
@@ -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;
                }
index 3075367213691dbaf33fe37e67ae2722bb9aa50b..0e5b5943307d761b17ab6cdc27611a2a4476d049 100644 (file)
@@ -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);
index 0d0f3bca252a91240a8c4cd947833eee9cc70511..3299afa50a6edd16833bd17794c4a2f8fc860c0d 100644 (file)
@@ -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__