emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/login.c: timeout, delay, and retries should be unsigned.

Browse Source 
* src/login.c: Ignore the return value of alarm() and sleep().
This commit is contained in:
nekral-guest 2009-04-22 20:15:21 +00:00
parent 53e0ff91d3
commit 46d697cded
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-22 Nicolas François <nicolas.francois@centraliens.net>
* src/login.c: timeout, delay, and retries should be unsigned.
* src/login.c: Ignore the return value of alarm() and sleep().
2009-04-22 Nicolas François <nicolas.francois@centraliens.net> 2009-04-22 Nicolas François <nicolas.francois@centraliens.net>
* src/login.c: If we cannot get the terminal configuration, do not * src/login.c: If we cannot get the terminal configuration, do not

22
src/login.c
View File

@ -101,7 +101,7 @@ static bool hflg = false;
static bool preauth_flag = false; static bool preauth_flag = false;
static bool amroot; static bool amroot;
static int timeout; static unsigned int timeout;
/* /*
* External identifiers. * External identifiers.
@ -413,7 +413,7 @@ static void init_env (void)
static RETSIGTYPE alarm_handler (unused int sig) static RETSIGTYPE alarm_handler (unused int sig)
{ {
fprintf (stderr, _("\nLogin timed out after %d seconds.\n"), timeout); fprintf (stderr, _("\nLogin timed out after %u seconds.\n"), timeout);
exit (0); exit (0);
} }
@ -522,8 +522,8 @@ int main (int argc, char **argv)
#if defined(HAVE_STRFTIME) && !defined(USE_PAM) #if defined(HAVE_STRFTIME) && !defined(USE_PAM)
char ptime[80]; char ptime[80];
#endif #endif
int delay; unsigned int delay;
int retries; unsigned int retries;
bool failed; bool failed;
bool subroot = false; bool subroot = false;
#ifndef USE_PAM #ifndef USE_PAM
@ -695,14 +695,14 @@ int main (int argc, char **argv)
top: top:
/* only allow ALARM sec. for login */ /* only allow ALARM sec. for login */
(void) signal (SIGALRM, alarm_handler); (void) signal (SIGALRM, alarm_handler);
timeout = getdef_num ("LOGIN_TIMEOUT", ALARM); timeout = getdef_unum ("LOGIN_TIMEOUT", ALARM);
if (timeout > 0) { if (timeout > 0) {
alarm (timeout); (void) alarm (timeout);
} }
environ = newenvp; /* make new environment active */ environ = newenvp; /* make new environment active */
delay = getdef_num ("FAIL_DELAY", 1); delay = getdef_unum ("FAIL_DELAY", 1);
retries = getdef_num ("LOGIN_RETRIES", RETRIES); retries = getdef_unum ("LOGIN_RETRIES", RETRIES);
#ifdef USE_PAM #ifdef USE_PAM
retcode = pam_start ("login", username, &conv, &pamh); retcode = pam_start ("login", username, &conv, &pamh);
@ -847,7 +847,7 @@ int main (int argc, char **argv)
} }
/* We don't get here unless they were authenticated above */ /* We don't get here unless they were authenticated above */
alarm (0); (void) alarm (0);
} }
/* Check the account validity */ /* Check the account validity */
@ -1065,7 +1065,7 @@ int main (int argc, char **argv)
* before the sleep() below completes, login will exit. * before the sleep() below completes, login will exit.
*/ */
if (delay > 0) { if (delay > 0) {
sleep (delay); (void) sleep (delay);
} }
puts (_("Login incorrect")); puts (_("Login incorrect"));
@ -1078,7 +1078,7 @@ int main (int argc, char **argv)
} /* while (true) */ } /* while (true) */
#endif /* ! USE_PAM */ #endif /* ! USE_PAM */
alarm (0); /* turn off alarm clock */ (void) alarm (0); /* turn off alarm clock */
#ifndef USE_PAM /* PAM does this */ #ifndef USE_PAM /* PAM does this */
/* /*