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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-08-30 22:47:07 +0000 (Tue, 30 Aug 2005)
New Revision: 500

Added:
   branches/experimental/debian/patches/365_PAM_copy_environ_later
Modified:
   branches/experimental/debian/patches/series
Log:
Fixthe redundant copy of the environment.
Also add the 446_newgrp.1_no_SHADOWPWD patch to series (I forgot to checkin series when I added this file)


Added: branches/experimental/debian/patches/365_PAM_copy_environ_later
===================================================================
--- branches/experimental/debian/patches/365_PAM_copy_environ_later	2005-08-30 22:45:22 UTC (rev 499)
+++ branches/experimental/debian/patches/365_PAM_copy_environ_later	2005-08-30 22:47:07 UTC (rev 500)
@@ -0,0 +1,22 @@
+Goal: When PAM is used, the environment must be copied later.
+      This was present in 4.0.11
+
+Status wrt upstream: will be in 4.0.13
+      
+Index: shadow-4.0.12/src/su.c
+===================================================================
+--- shadow-4.0.12.orig/src/su.c	2005-08-11 21:15:07.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-11 21:30:06.000000000 +0200
+@@ -781,9 +781,12 @@
+ 		addenv ("PATH", cp);
+ 	}
+ 
++#ifndef USE_PAM
++/* setup the environment for pam later on, else we run into auth problems */
+ 	if (change_environment || restricted_shell(pwent.pw_shell)) {
+ 		environ = newenvp;	/* make new environment active */
+ 	}
++#endif				/* !USE_APM */
+ 
+ 	if (getenv ("IFS"))	/* don't export user IFS ... */
+ 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-08-30 22:45:22 UTC (rev 499)
+++ branches/experimental/debian/patches/series	2005-08-30 22:47:07 UTC (rev 500)
@@ -123,7 +123,7 @@
 # need to be tested, but it is probably not needed
 #422_getdate.c_generated_file 
 010_more-i18ned-messages
-# 356_su-stop_cont-proxy # depends on 439_su_PAM_session
+# 356_su-stop_cont-proxy # no more needed?
 # NOTE: you must use only one of these 423
 # See bug #317264, #276419
 # 423_su_pass_args_without_concatenation # upstream don't suffer from this
@@ -142,7 +142,9 @@
 443_chage_exit_values
 # 364 has been fixed in 4.0.12
 # 364_ENV_SUPATH
+365_PAM_copy_environ_later
 445_su_password_expired
+446_newgrp.1_no_SHADOWPWD
 #207_id-manpages
 # 999 applied to debian/* files. It has been applied directly
 # 999_hack_build_package