[Pkg-shadow-commits] r1481 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-08 23:27:35 +0000 (Sat, 08 Dec 2007)
New Revision: 1481

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/login.c
Log:
Make sure is_console is only defined when USE_PAM is not defined.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-08 23:25:52 UTC (rev 1480)
+++ upstream/trunk/ChangeLog	2007-12-08 23:27:35 UTC (rev 1481)
@@ -1,5 +1,10 @@
 2007-12-09  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* libmisc/pwd2spwd.c: Fix time() prototype.
 
 2007-12-08  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2007-12-08 23:25:52 UTC (rev 1480)
+++ upstream/trunk/src/login.c	2007-12-08 23:27:35 UTC (rev 1481)
@@ -334,7 +334,9 @@
 	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 @@
 	 */
 	checkutmp (!amroot);
 	STRFCPY (tty, utent.ut_line);
+#ifndef USE_PAM
 	is_console = console (tty);
+#endif
 
 	if (rflg || hflg) {
 #ifdef UT_ADDR