[Pkg-shadow-commits] r417 - in branches/experimental/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-07-27 18:53:49 +0000 (Wed, 27 Jul 2005)
New Revision: 417

Added:
   branches/experimental/debian/patches/364_ENV_SUPATH
Modified:
   branches/experimental/debian/login.defs
   branches/experimental/debian/patches/series
Log:
Re-introduce ENV_SUPATH and ENV_PATH


Modified: branches/experimental/debian/login.defs
===================================================================
--- branches/experimental/debian/login.defs	2005-07-26 01:06:32 UTC (rev 416)
+++ branches/experimental/debian/login.defs	2005-07-27 18:53:49 UTC (rev 417)
@@ -1,7 +1,7 @@
 #
 # /etc/login.defs - Configuration control definitions for the login package.
 #
-# This item must be defined:  MAIL_DIR.
+# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
 # If unspecified, some arbitrary (and possibly incorrect) value will
 # be assumed.  All other items are optional - if not specified then
 # the described action or option will be inhibited.
@@ -107,6 +107,13 @@
 #HUSHLOGIN_FILE	/etc/hushlogins
 
 #
+# *REQUIRED*  The default PATH settings, for superuser and normal users.
+#
+# (they are minimal, add the rest in the shell startup files)
+ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
+ENV_PATH	PATH=/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
+
+#
 # Terminal permissions
 #
 #	TTYGROUP	Login tty will be assigned this group ownership.

Added: branches/experimental/debian/patches/364_ENV_SUPATH
===================================================================
--- branches/experimental/debian/patches/364_ENV_SUPATH	2005-07-26 01:06:32 UTC (rev 416)
+++ branches/experimental/debian/patches/364_ENV_SUPATH	2005-07-27 18:53:49 UTC (rev 417)
@@ -0,0 +1,51 @@
+Goal: re-activate "ENV_PATH" and "ENV_SUPATH", because su has to set a
+      different PATH for root (and thus this cannot be handled by pam_env)
+
+Status wrt upstream: Will be fixed in 4.0.12
+
+Note: In upstream, "environ = newenvp;" is not enclosed in a #ifndef
+      USE_PAM. It should probably be. To be checked.
+
+Index: shadow-4.0.11.1/lib/getdef.c
+===================================================================
+--- shadow-4.0.11.1.orig/lib/getdef.c	2005-07-27 13:36:58.000000000 +0200
++++ shadow-4.0.11.1/lib/getdef.c	2005-07-27 13:38:43.000000000 +0200
+@@ -63,9 +63,7 @@
+ 	{"CHSH_AUTH", NULL},
+ 	{"CRACKLIB_DICTPATH", NULL},
+ 	{"ENV_HZ", NULL},
+-	{"ENV_PATH", NULL},
+ 	{"ENV_ROOTPATH", NULL},	/* SuSE compatibility? */
+-	{"ENV_SUPATH", NULL},
+ 	{"ENV_TZ", NULL},
+ 	{"ENVIRON_FILE", NULL},
+ 	{"ISSUE_FILE", NULL},
+@@ -90,6 +88,8 @@
+ 	{"CONSOLE_GROUPS", NULL},
+ 	{"CONSOLE", NULL},
+ 	{"CREATE_HOME", NULL},
++	{"ENV_PATH", NULL},
++	{"ENV_SUPATH", NULL},
+ 	{"ERASECHAR", NULL},
+ 	{"FAKE_SHELL", NULL},
+ 	{"GETPASS_ASTERISKS", NULL},
+Index: shadow-4.0.11.1/src/su.c
+===================================================================
+--- shadow-4.0.11.1.orig/src/su.c	2005-07-27 13:36:58.000000000 +0200
++++ shadow-4.0.11.1/src/su.c	2005-07-27 14:52:14.000000000 +0200
+@@ -770,7 +770,6 @@
+ 
+ 	signal (SIGINT, SIG_DFL);
+ 	signal (SIGQUIT, SIG_DFL);
+-#ifndef USE_PAM
+ 	cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
+ 
+ 	/* XXX very similar code duplicated in libmisc/setupenv.c */
+@@ -782,6 +781,7 @@
+ 		addenv ("PATH", cp);
+ 	}
+ 
++#ifndef USE_PAM
+ 	if (change_environment || restricted_shell(pwent.pw_shell)) {
+ 		environ = newenvp;	/* make new environment active */
+ 	}

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-07-26 01:06:32 UTC (rev 416)
+++ branches/experimental/debian/patches/series	2005-07-27 18:53:49 UTC (rev 417)
@@ -151,8 +151,8 @@
 443_man_it_Makefile.am
 444_missing_Italian_manpages
 362_warning_messages
-999_hack_build_package
 443_chage_exit_values
-# 443_chage_exit_values
+364_ENV_SUPATH
 # 444_no_strip_during_install # not needed
 #207_id-manpages
+999_hack_build_package