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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-08-21 20:37:23 +0000 (Sat, 21 Aug 2010)
New Revision: 3229

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/sulogin.c
Log:
	* src/sulogin.c: Fix a const issue.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-08-21 19:55:46 UTC (rev 3228)
+++ upstream/trunk/ChangeLog	2010-08-21 20:37:23 UTC (rev 3229)
@@ -2,6 +2,7 @@
 
 	* src/passwd.c: Fix a const issue.
 	* src/passwd.c: Avoid multi-statements lines.
+	* src/sulogin.c: Fix a const issue.
 
 2010-08-21  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/sulogin.c
===================================================================
--- upstream/trunk/src/sulogin.c	2010-08-21 19:55:46 UTC (rev 3228)
+++ upstream/trunk/src/sulogin.c	2010-08-21 20:37:23 UTC (rev 3229)
@@ -80,7 +80,7 @@
 
  /*ARGSUSED*/ int main (int argc, char **argv)
 {
-	char *cp;
+	const char *env;
 	char **envp = environ;
 	TERMIO termio;
 	int err = 0;
@@ -162,13 +162,13 @@
 
 #ifndef USE_PAM
 
-	cp = getdef_str ("ENV_TZ");
-	if (NULL != cp) {
-		addenv (('/' == *cp) ? tz (cp) : cp, NULL);
+	env = getdef_str ("ENV_TZ");
+	if (NULL != env) {
+		addenv (('/' == *env) ? tz (env) : env, NULL);
 	}
-	cp = getdef_str ("ENV_HZ");
-	if (NULL != cp) {
-		addenv (cp, NULL);	/* set the default $HZ, if one */
+	env = getdef_str ("ENV_HZ");
+	if (NULL != env) {
+		addenv (env, NULL);	/* set the default $HZ, if one */
 	}
 #endif				/* !USE_PAM */
 
@@ -178,6 +178,7 @@
 	(void) alarm (ALARM);		/* only wait so long ... */
 
 	while (true) {		/* repeatedly get login/password pairs */
+		char *cp;
 		pw_entry (name, &pwent);	/* get entry from password file */
 		if (pwent.pw_name == (char *) 0) {
 			/*