From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 8 Dec 2007 23:27:35 +0000 (+0000)
Subject: Make sure is_console is only defined when USE_PAM is not defined.
X-Git-Tag: 4.1.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ac8c65e37b3e113b4a65ea23420314e85655711;p=thirdparty%2Fshadow.git

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

diff --git a/ChangeLog b/ChangeLog
index 39a6bd50c..4453605d8 100644
--- 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 1120d2635..8deb992c0 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