[Pkg-shadow-commits] r1578 - upstream/trunk/src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-31 15:13:39 +0000 (Mon, 31 Dec 2007)
New Revision: 1578

Modified:
   upstream/trunk/src/chsh.c
Log:
(compil fix) Use pw->pw_name instead of user.


Modified: upstream/trunk/src/chsh.c
===================================================================
--- upstream/trunk/src/chsh.c	2007-12-31 15:07:59 UTC (rev 1577)
+++ upstream/trunk/src/chsh.c	2007-12-31 15:13:39 UTC (rev 1578)
@@ -235,10 +235,11 @@
 	 * UID of the user matches the current real UID.
 	 */
 	if (!amroot && pw->pw_uid != getuid ()) {
-		SYSLOG ((LOG_WARN, "can't change shell for `%s'", user));
+		SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
 		closelog ();
 		fprintf (stderr,
-		         _("You may not change the shell for %s.\n"), user);
+		         _("You may not change the shell for %s.\n"),
+		         pw->pw_name);
 		exit (1);
 	}
 
@@ -247,10 +248,11 @@
 	 * is not a restricted one.
 	 */
 	if (!amroot && restricted_shell (pw->pw_shell)) {
-		SYSLOG ((LOG_WARN, "can't change shell for `%s'", user));
+		SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
 		closelog ();
 		fprintf (stderr,
-		         _("You may not change the shell for %s.\n"), user);
+		         _("You may not change the shell for %s.\n"),
+		         pw->pw_name);
 		exit (1);
 	}
 #ifdef WITH_SELINUX
@@ -261,10 +263,11 @@
 	if ((pw->pw_uid != getuid ())
 	    && (is_selinux_enabled () > 0)
 	    && (selinux_check_passwd_access (PASSWD__CHSH) != 0)) {
-		SYSLOG ((LOG_WARN, "can't change shell for `%s'", user));
+		SYSLOG ((LOG_WARN, "can't change shell for `%s'", pw->pw_name));
 		closelog ();
 		fprintf (stderr,
-		         _("You may not change the shell for %s.\n"), user);
+		         _("You may not change the shell for %s.\n"),
+		         pw->pw_name);
 		exit (1);
 	}
 #endif