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

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 08:14:24 +0000 (Wed, 17 Aug 2005)
New Revision: 446

Modified:
   branches/experimental/debian/patches/437_su_add_GNU_options_2
Log:
Refresh 437_..._2 to 4.0.12


Modified: branches/experimental/debian/patches/437_su_add_GNU_options_2
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_2	2005-08-17 08:13:32 UTC (rev 445)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_2	2005-08-17 08:14:24 UTC (rev 446)
@@ -7,11 +7,11 @@
      * arg0 is computed in run_shell.
      * There is no more need for doshell. We know that we only need to
        execute a shell when there is no additional arguments.
-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 19:32:04.000000000 +0200
-+++ shadow-4.0.10/src/su.c	2005-07-22 19:35:30.000000000 +0200
-@@ -131,6 +131,24 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 10:13:00.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 10:13:46.000000000 +0200
+@@ -128,6 +128,24 @@
  }
  #endif				/* !USE_PAM */
  
@@ -36,7 +36,7 @@
  
  static void su_failure (const char *tty)
  {
-@@ -154,23 +172,70 @@
+@@ -150,23 +168,70 @@
  {
  	++caught;
  }
@@ -109,7 +109,7 @@
  			shell (shellstr, (char *) args[0]);
  		else
  			(void) execv (shellstr, (char **) args);
-@@ -248,8 +313,8 @@
+@@ -244,8 +309,8 @@
  	}
  
  	exit (WEXITSTATUS (status));
@@ -119,7 +119,7 @@
  
  /*
   * su - switch user id
-@@ -270,7 +335,6 @@
+@@ -266,7 +331,6 @@
  	char *cp;
  	char **envcp;
  	const char *tty = 0;	/* Name of tty SU is run from        */
@@ -127,7 +127,7 @@
  	int fakelogin = 0;
  	int amroot = 0;
  	uid_t my_uid;
-@@ -392,7 +456,6 @@
+@@ -388,7 +452,6 @@
  	if (optind < argc)
  		additional_args = argv + optind;
  
@@ -135,7 +135,7 @@
  	/*
  	 * If a new login is being set up, the old environment will be
  	 * ignored and a new one created later on.
-@@ -427,8 +490,6 @@
+@@ -423,8 +486,6 @@
  			addenv (*envp++, NULL);
  	}
  
@@ -144,7 +144,7 @@
  	/*
  	 * Get the user's real name. The current UID is used to determine
  	 * who has executed su. That user ID must exist.
-@@ -758,48 +819,7 @@
+@@ -753,48 +814,7 @@
  	 */
  	closelog ();