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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-07-24 20:44:46 +0000 (Sun, 24 Jul 2005)
New Revision: 403

Modified:
   branches/experimental/debian/patches/008_su_check_user_earlier
   branches/experimental/debian/patches/008_su_get_PAM_username
   branches/experimental/debian/patches/439_su_PAM_session
Log:
Update after the 437 update.


Modified: branches/experimental/debian/patches/008_su_check_user_earlier
===================================================================
--- branches/experimental/debian/patches/008_su_check_user_earlier	2005-07-24 20:43:00 UTC (rev 402)
+++ branches/experimental/debian/patches/008_su_check_user_earlier	2005-07-24 20:44:46 UTC (rev 403)
@@ -33,8 +33,8 @@
  	 * ignored and a new one created later on.
  	 */
 @@ -403,18 +415,6 @@
- 			addenv (*envp++, NULL);
- 	}
+ 	if (optind < argc)
+ 		additional_args = argv + optind;
  
 -	/*
 -	 * Get the user's real name. The current UID is used to determine

Modified: branches/experimental/debian/patches/008_su_get_PAM_username
===================================================================
--- branches/experimental/debian/patches/008_su_get_PAM_username	2005-07-24 20:43:00 UTC (rev 402)
+++ branches/experimental/debian/patches/008_su_get_PAM_username	2005-07-24 20:44:46 UTC (rev 403)
@@ -5,11 +5,19 @@
    I don't know what this patch is used for. IMO, the user name is
    already known before calling pam_get_item(pamh, PAM_USER, ...)
 
-Index: shadow-4.0.3/src/su.c
+Index: shadow-4.0.10/src/su.c
 ===================================================================
---- shadow-4.0.3.orig/src/su.c	2005-05-29 17:46:18.121112000 +0200
-+++ shadow-4.0.3/src/su.c	2005-05-29 17:47:07.311112000 +0200
-@@ -564,6 +564,14 @@
+--- shadow-4.0.10.orig/src/su.c	2005-07-22 01:27:30.000000000 +0200
++++ shadow-4.0.10/src/su.c	2005-07-22 01:28:40.000000000 +0200
+@@ -347,6 +347,7 @@
+ 	char **envp = environ;
+ 	char *command = 0, *shell = 0, **additional_args = 0;
+ 	int optc;
++	char *tmp_name;
+ 
+ #ifdef USE_PAM
+ 	int ret;
+@@ -659,6 +660,14 @@
  			su_failure (tty);
  		}
  	}

Modified: branches/experimental/debian/patches/439_su_PAM_session
===================================================================
--- branches/experimental/debian/patches/439_su_PAM_session	2005-07-24 20:43:00 UTC (rev 402)
+++ branches/experimental/debian/patches/439_su_PAM_session	2005-07-24 20:44:46 UTC (rev 403)
@@ -7,18 +7,21 @@
 
 Index: shadow-4.0.10/src/su.c
 ===================================================================
---- shadow-4.0.10.orig/src/su.c	2005-07-10 11:48:56.000000000 +0300
-+++ shadow-4.0.10/src/su.c	2005-07-10 14:40:22.000000000 +0300
-@@ -148,13 +148,15 @@
-  */
- static void run_shell (const char *shellstr, char *args[], int doshell)
+--- shadow-4.0.10.orig/src/su.c	2005-07-20 00:54:30.000000000 +0200
++++ shadow-4.0.10/src/su.c	2005-07-20 00:54:54.000000000 +0200
+@@ -191,7 +191,7 @@
+ static void run_shell (const char *shellstr, char **additional_args, int fakelogin)
  {
+ 	const char **args;
 -	int child;
 +	int child = 0;
  	sigset_t ourset;
  	int status;
  	int ret;
- 
+@@ -230,8 +230,10 @@
+ 		shell (shellstr, args[0]);
+ 	/* NOT REACHED */
+ #else
 -	child = fork ();
 -	if (child == 0) {	/* child shell */
 +	if (getdef_bool("CLOSE_SESSIONS")) {
@@ -27,8 +30,8 @@
 +	if (child == 0) {	/* child shell or no CLOSE_SESSIONS */
  		pam_end (pamh, PAM_SUCCESS);
  
- 		if (doshell)
-@@ -172,6 +174,7 @@
+ 		if (argno == 1)
+@@ -249,6 +251,7 @@
  		closelog ();
  		exit (1);
  	}
@@ -36,7 +39,7 @@
  	/* parent only */
  	sigfillset (&ourset);
  	if (sigprocmask (SIG_BLOCK, &ourset, NULL)) {
-@@ -656,6 +659,7 @@
+@@ -774,6 +777,7 @@
  		SYSLOG ((LOG_ERR, "pam_open_session: %s",
  			 pam_strerror (pamh, ret)));
  		fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret));
@@ -44,7 +47,7 @@
  		pam_end (pamh, ret);
  		exit (1);
  	}
-@@ -677,6 +681,7 @@
+@@ -795,6 +799,7 @@
  
  	/* become the new user */
  	if (change_uid (&pwent)) {