[Pkg-shadow-commits] r171 - trunk/debian/patches

Nicolas FRANCOIS pkg-shadow-devel@lists.alioth.debian.org
Sun, 22 May 2005 23:40:47 +0000


Author: nekral-guest
Date: 2005-05-22 23:40:47 +0000 (Sun, 22 May 2005)
New Revision: 171

Added:
   trunk/debian/patches/008_newgrp_preserve_env
Modified:
   trunk/debian/patches/008_src.dpatch
   trunk/debian/patches/series
Log:
Move some bits from 008_src.dpatch to 008_newgrp_preserve_env


Added: trunk/debian/patches/008_newgrp_preserve_env
===================================================================
--- trunk/debian/patches/008_newgrp_preserve_env	2005-05-22 23:35:42 UTC (rev 170)
+++ trunk/debian/patches/008_newgrp_preserve_env	2005-05-22 23:40:47 UTC (rev 171)
@@ -0,0 +1,21 @@
+Goal: src/newgrp.c: don't call sanitize_env()
+Fixes: #22244
+
+Status wrt upstream: Upstream do not call sanitize_env.
+                     As newgrp code is quite different in upstream, it could be
+                     nice if Tomasz could check http//bugs.debian.org/22244
+                     (IMO, upstream is correct)
+
+Index: shadow-4.0.3/src/newgrp.c
+===================================================================
+--- shadow-4.0.3.orig/src/newgrp.c	2005-05-22 23:13:45.907167000 +0200
++++ shadow-4.0.3/src/newgrp.c	2005-05-22 23:16:36.157167000 +0200
+@@ -91,7 +91,7 @@
+ 
+ #if ENABLE_NLS
+ 	/* XXX - remove when gettext is safe to use in setuid programs */
+-	sanitize_env ();
++	/* sanitize_env ();*/
+ #endif
+ 
+ 	setlocale (LC_ALL, "");

Modified: trunk/debian/patches/008_src.dpatch
===================================================================
--- trunk/debian/patches/008_src.dpatch	2005-05-22 23:35:42 UTC (rev 170)
+++ trunk/debian/patches/008_src.dpatch	2005-05-22 23:40:47 UTC (rev 171)
@@ -313,19 +313,6 @@
  	closelog ();
  #ifdef RADIUS
  	if (is_rad_login) {
-Index: shadow-4.0.3/src/newgrp.c
-===================================================================
---- shadow-4.0.3.orig/src/newgrp.c	2005-05-23 00:40:16.187167000 +0200
-+++ shadow-4.0.3/src/newgrp.c	2005-05-23 00:40:50.307167000 +0200
-@@ -91,7 +91,7 @@
- 
- #if ENABLE_NLS
- 	/* XXX - remove when gettext is safe to use in setuid programs */
--	sanitize_env ();
-+	/* sanitize_env ();*/
- #endif
- 
- 	setlocale (LC_ALL, "");
 Index: shadow-4.0.3/src/su.c
 ===================================================================
 --- shadow-4.0.3.orig/src/su.c	2005-05-23 00:40:16.187167000 +0200

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-05-22 23:35:42 UTC (rev 170)
+++ trunk/debian/patches/series	2005-05-22 23:40:47 UTC (rev 171)
@@ -10,6 +10,7 @@
 008_login_opt-f_with_username_after--
 008_usermod_warn_old_home_not_removed
 008_userdel_remove_group_from_gshadow
+008_newgrp_preserve_env
 009_etc.dpatch
 010_chpasswd-md5.dpatch
 100_LINGUAS.dpatch