From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Tue, 18 Oct 2011 20:28:01 +0000 (+0000)
Subject: 	* src/sulogin.c (main): env is only used when USE_PAM is not set.
X-Git-Tag: 4.1.5~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2afa955401633a60696100b925c189c9e83cad9a;p=thirdparty%2Fshadow.git

	* src/sulogin.c (main): env is only used when USE_PAM is not set.
---

diff --git a/ChangeLog b/ChangeLog
index c0c9fe05d..f76e242df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* lib/nscd.c: Remove unused variable.
 	* lib/prototypes.h, libmisc/cleanup.c, lib/spawn.c, src/chage.c:
 	Add splint annotations.
+	* src/sulogin.c (main): env is only used when USE_PAM is not set.
 
 2011-10-15  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/src/sulogin.c b/src/sulogin.c
index bd21f3cf1..ccbf2c5d2 100644
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -82,7 +82,9 @@ static RETSIGTYPE catch_signals (unused int sig)
 
  /*ARGSUSED*/ int main (int argc, char **argv)
 {
+#ifndef USE_PAM
 	const char *env;
+#endif				/* !USE_PAM */
 	char **envp = environ;
 	TERMIO termio;
 	int err = 0;
@@ -164,7 +166,6 @@ static RETSIGTYPE catch_signals (unused int sig)
 	}
 
 #ifndef USE_PAM
-
 	env = getdef_str ("ENV_TZ");
 	if (NULL != env) {
 		addenv (('/' == *env) ? tz (env) : env, NULL);