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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-05 13:53:14 +0000 (Sat, 05 Jan 2008)
New Revision: 1640

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/login.c
Log:
login_prompt is the name of a function, use loginprompt for the internal variable.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-05 13:51:43 UTC (rev 1639)
+++ upstream/trunk/ChangeLog	2008-01-05 13:53:14 UTC (rev 1640)
@@ -21,6 +21,8 @@
 	OK as long as prototypes.h included this file.)
 	* src/nologin.c: Make a proper prototype for the main() function
 	declaration. (add void)
+	* src/login.c: login_prompt is the name of a function, use
+	loginprompt for the internal variable.
 
 2008-01-01  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2008-01-05 13:51:43 UTC (rev 1639)
+++ upstream/trunk/src/login.c	2008-01-05 13:53:14 UTC (rev 1640)
@@ -608,19 +608,19 @@
 		if (!fflg || (getuid () != 0)) {
 			int failcount = 0;
 			char hostn[256];
-			char login_prompt[256];	/* That's one hell of a prompt :) */
+			char loginprompt[256];	/* That's one hell of a prompt :) */
 
 			/* Make the login prompt look like we want it */
 			if (!gethostname (hostn, sizeof (hostn)))
-				snprintf (login_prompt,
-					  sizeof (login_prompt),
+				snprintf (loginprompt,
+					  sizeof (loginprompt),
 					  _("%s login: "), hostn);
 			else
-				snprintf (login_prompt,
-					  sizeof (login_prompt), _("login: "));
+				snprintf (loginprompt,
+					  sizeof (loginprompt), _("login: "));
 
 			retcode =
-			    pam_set_item (pamh, PAM_USER_PROMPT, login_prompt);
+			    pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
 			PAM_FAIL_CHECK;
 
 			/* if we didn't get a user on the command line,