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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-06-13 18:25:51 +0000 (Mon, 13 Jun 2011)
New Revision: 3342

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/su.c
Log:
	* src/su.c: No need to change the user's shell in case of
	subsystem root. Update the comments.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-06-13 18:25:45 UTC (rev 3341)
+++ upstream/trunk/ChangeLog	2011-06-13 18:25:51 UTC (rev 3342)
@@ -6,6 +6,8 @@
 	not change environ) the authentication. And the authentication
 	does not overwrite those definitions. This will ease an extraction
 	from the big main() function.
+	* src/su.c: No need to change the user's shell in case of
+	subsystem root. Update the comments.
 
 2011-06-10  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2011-06-13 18:25:45 UTC (rev 3341)
+++ upstream/trunk/src/su.c	2011-06-13 18:25:51 UTC (rev 3342)
@@ -908,11 +908,10 @@
 	 * --shell, which will be the one executed in the chroot later).
 	 */
 	if ('*' == pwent.pw_shell[0]) {	/* subsystem root required */
-		pwent.pw_shell++;	/* skip the '*' */
-		subsystem (&pwent);	/* figure out what to execute */
-		endpwent ();
+		subsystem (&pwent);	/* change to the subsystem root */
+		endpwent ();		/* close the old password databases */
 		endspent ();
-		goto top;
+		goto top;		/* authenticate in the subsystem */
 	}
 
 	sulog (tty, true, oldname, name);	/* save SU information */