From 9ac8c65e37b3e113b4a65ea23420314e85655711 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 8 Dec 2007 23:27:35 +0000 Subject: [PATCH] Make sure is_console is only defined when USE_PAM is not defined. --- ChangeLog | 5 +++++ src/login.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 39a6bd50..4453605d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-09 Nicolas François + + * src/login.c: Make sure is_console is only defined when USE_PAM + is not defined. + 2007-12-09 Nicolas François * libmisc/pwd2spwd.c: Fix time() prototype. diff --git a/src/login.c b/src/login.c index 1120d263..8deb992c 100644 --- a/src/login.c +++ b/src/login.c @@ -334,7 +334,9 @@ int main (int argc, char **argv) int failed; int flag; int subroot = 0; +#ifndef USE_PAM int is_console; +#endif int err; const char *cp; char *tmp; @@ -440,7 +442,9 @@ int main (int argc, char **argv) */ checkutmp (!amroot); STRFCPY (tty, utent.ut_line); +#ifndef USE_PAM is_console = console (tty); +#endif if (rflg || hflg) { #ifdef UT_ADDR