[Pkg-shadow-commits] r447 - branches/experimental/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 08:17:38 +0000 (Wed, 17 Aug 2005)
New Revision: 447

Modified:
   branches/experimental/debian/patches/437_su_add_GNU_options_3
Log:
Fixed to apply on 4.0.12


Modified: branches/experimental/debian/patches/437_su_add_GNU_options_3
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_3	2005-08-17 08:14:24 UTC (rev 446)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_3	2005-08-17 08:17:38 UTC (rev 447)
@@ -2,11 +2,11 @@
      * add -c ability to run_shell.
      * only change environment if the user did not requested to preserve
        the environment, or if the user has a restricted shell.
-Index: shadow-4.0.10/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.10.orig/src/su.c	2005-07-22 18:48:13.000000000 +0200
-+++ shadow-4.0.10/src/su.c	2005-07-22 18:49:13.000000000 +0200
-@@ -188,7 +188,10 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 10:13:46.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 10:16:56.000000000 +0200
+@@ -185,7 +185,10 @@
   * have been applied.  Some work was needed to get it integrated into
   * su.c from shadow.
   */
@@ -18,7 +18,7 @@
  {
  	const char **args;
  	int child;
-@@ -197,8 +200,10 @@
+@@ -194,8 +197,10 @@
  	int ret;
  	int argno = 0;
  
@@ -30,7 +30,7 @@
  
  	if (fakelogin) {
  		char *arg0;
-@@ -216,11 +221,17 @@
+@@ -213,11 +218,17 @@
  		args[0] = Basename (shellstr);
  	argno = 1;
  
@@ -48,7 +48,7 @@
  	args[argno] = NULL;
  
  #ifndef USE_PAM
-@@ -720,7 +731,9 @@
+@@ -699,7 +710,9 @@
  		addenv ("PATH", cp);
  	}
  
@@ -56,10 +56,10 @@
 +	if (change_environment || restricted_shell(pwent.pw_shell)) {
 +		environ = newenvp;	/* make new environment active */
 +	}
- #endif				/* !USE_PAM */
  
  	if (getenv ("IFS"))	/* don't export user IFS ... */
-@@ -771,18 +784,20 @@
+ 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */
+@@ -766,18 +779,20 @@
  		exit (1);
  	}
  
@@ -92,7 +92,7 @@
  		}
  	}
  
-@@ -800,15 +815,17 @@
+@@ -795,15 +810,17 @@
  		exit (1);
  #endif				/* !USE_PAM */
  
@@ -117,7 +117,7 @@
  
  	/*
  	 * This is a workaround for Linux libc bug/feature (?) - the
-@@ -819,7 +836,7 @@
+@@ -814,7 +831,7 @@
  	 */
  	closelog ();