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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-05 13:54:39 +0000 (Sat, 05 Jan 2008)
New Revision: 1641

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chsh.c
Log:
loginsh is a global variable, use newshell for the update_shell()'s parameter.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-05 13:53:14 UTC (rev 1640)
+++ upstream/trunk/ChangeLog	2008-01-05 13:54:39 UTC (rev 1641)
@@ -23,6 +23,8 @@
 	declaration. (add void)
 	* src/login.c: login_prompt is the name of a function, use
 	loginprompt for the internal variable.
+	* src/chsh.c: loginsh is a global variable, use newshell for the
+	update_shell()'s parameter.
 
 2008-01-01  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/chsh.c
===================================================================
--- upstream/trunk/src/chsh.c	2008-01-05 13:53:14 UTC (rev 1640)
+++ upstream/trunk/src/chsh.c	2008-01-05 13:54:39 UTC (rev 1641)
@@ -331,7 +331,7 @@
  *
  *	It will not return in case of error.
  */
-static void update_shell (const char *user, char *loginsh)
+static void update_shell (const char *user, char *newshell)
 {
 	const struct passwd *pw;	/* Password entry from /etc/passwd   */
 	struct passwd pwent;		/* New password entry                */
@@ -389,7 +389,7 @@
 	 * fields remain unchanged.
 	 */
 	pwent = *pw;
-	pwent.pw_shell = loginsh;
+	pwent.pw_shell = newshell;
 
 	/*
 	 * Update the passwd file entry. If there is a DBM file, update