Make sure is_console is only defined when USE_PAM is not defined.

diff --git a/ChangeLog b/ChangeLog
index 39a6bd50cd22abdb6b00f6c02134329469b994de..4453605d8e4dbdc5e2b560ecdb072e5e4d9b10f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-09  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/login.c: Make sure is_console is only defined when USE_PAM
+       is not defined.
+
 2007-12-09  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/pwd2spwd.c: Fix time() prototype.

diff --git a/src/login.c b/src/login.c
index 1120d2635929758f023d9e603c5ebed2aa5cca77..8deb992c0674903aa7020d314df2c4a801cc7dc1 100644 (file)
--- 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