From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 25 Nov 2013 01:48:24 +0400 From: "Dmitry V. Levin" To: kbd@lists.altlinux.org Message-ID: <20131124214823.GB20405@altlinux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [kbd] [PATCH 2/3] vlock: rename ERROR_TIMEOUT macro to LONG_DELAY X-BeenThere: kbd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Linux console tools development discussion List-Id: Linux console tools development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2013 21:48:27 -0000 Archived-At: List-Archive: The name ERROR_TIMEOUT is somewhat misleading: PAM errors may vary, and some may require longer delays than others. Since ERROR_TIMEOUT means longer delay, rename it to LONG_DELAY. --- src/vlock/auth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vlock/auth.c b/src/vlock/auth.c index cac877c..76945c0 100644 --- a/src/vlock/auth.c +++ b/src/vlock/auth.c @@ -33,8 +33,8 @@ #include "vlock.h" #include "nls.h" -/* Unrecognized PAM error timeout. */ -#define ERROR_TIMEOUT 10 +/* Delay after fatal PAM errors, in seconds. */ +#define LONG_DELAY 10 static int do_account_password_management (pam_handle_t *pamh) @@ -76,7 +76,7 @@ get_password (pam_handle_t * pamh, const char *username, const char *tty) tty, username, uid); puts (_("Please try again later.\n\n\n")); fflush (stdout); - sleep (ERROR_TIMEOUT); + sleep (LONG_DELAY); continue; } } @@ -156,7 +156,7 @@ get_password (pam_handle_t * pamh, const char *username, const char *tty) msg = 0; pam_end (pamh, rc); pamh = 0; - sleep (ERROR_TIMEOUT); + sleep (LONG_DELAY); break; default: -- ldv