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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-09-01 13:15:18 +0000 (Thu, 01 Sep 2005)
New Revision: 516

Modified:
   branches/experimental/debian/patches/362_warning_messages
   branches/experimental/debian/patches/437_su_add_GNU_options_4
Log:
Merge one part of 362_warning_messages in 437_su_add_GNU_options_4.


Modified: branches/experimental/debian/patches/362_warning_messages
===================================================================
--- branches/experimental/debian/patches/362_warning_messages	2005-09-01 13:00:59 UTC (rev 515)
+++ branches/experimental/debian/patches/362_warning_messages	2005-09-01 13:15:18 UTC (rev 516)
@@ -30,23 +30,3 @@
  	cp = getdef_str ((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
  
  	if (!cp) {
-Index: shadow-4.0.12/src/su.c
-===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 11:51:11.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 11:51:18.000000000 +0200
-@@ -597,6 +597,7 @@
- 	 */
- 
- 	if (fakelogin && (change_environment || restricted_shell(pwent.pw_shell))) {
-+#ifndef USE_PAM
- 		if ((cp = getdef_str ("ENV_TZ")))
- 			addenv (*cp == '/' ? tz (cp) : cp, NULL);
- 		/*
-@@ -604,6 +605,7 @@
- 		 */
- 		if ((cp = getdef_str ("ENV_HZ")))
- 			addenv (cp, NULL);	/* set the default $HZ, if one */
-+#endif				/* !USE_PAM */
- 		/*
- 		 * The terminal type will be left alone if it is present in
- 		 * the environment already.

Modified: branches/experimental/debian/patches/437_su_add_GNU_options_4
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_4	2005-09-01 13:00:59 UTC (rev 515)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_4	2005-09-01 13:15:18 UTC (rev 516)
@@ -13,8 +13,8 @@
         restricted)
 Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:42.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 11:50:43.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-09-01 15:09:58.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-09-01 15:10:39.000000000 +0200
 @@ -208,14 +208,14 @@
  
  		shell_basename = getdef_str ("SU_NAME");
@@ -106,6 +106,13 @@
 +	 */
 +
 +	if (fakelogin && (change_environment || restricted_shell(pwent.pw_shell))) {
++		/*
++		 * The terminal type will be left alone if it is present in
++		 * the environment already.
++		 */
++		if ((cp = getenv ("TERM")))
++			addenv ("TERM", cp);
++#ifndef USE_PAM
 +		if ((cp = getdef_str ("ENV_TZ")))
 +			addenv (*cp == '/' ? tz (cp) : cp, NULL);
 +		/*
@@ -114,13 +121,6 @@
 +		if ((cp = getdef_str ("ENV_HZ")))
 +			addenv (cp, NULL);	/* set the default $HZ, if one */
 +		/*
-+		 * The terminal type will be left alone if it is present in
-+		 * the environment already.
-+		 */
-+		if ((cp = getenv ("TERM")))
-+			addenv ("TERM", cp);
-+#ifndef USE_PAM
-+		/*
 +		 * Also leave DISPLAY and XAUTHORITY if present, else
 +		 * pam_xauth will not work.
 +		 */