nixpkgs-suyu/pkgs/os-specific/linux/shadow/keep-path.patch

diff -ru shadow-4.1.5.1-orig/src/su.c shadow-4.1.5.1/src/su.c
--- shadow-4.1.5.1-orig/src/su.c	2012-05-25 07:51:55.000000000 -0400
+++ shadow-4.1.5.1/src/su.c	2012-07-25 17:22:57.013547930 -0400
@@ -879,6 +879,7 @@
 		}
 	}
 
+#if 0
 	cp = getdef_str ((pw->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
 	if (NULL == cp) {
 		addenv ((pw->pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL);
@@ -887,6 +888,7 @@
 	} else {
 		addenv ("PATH", cp);
 	}
+#endif
 
 	if (getenv ("IFS") != NULL) {	/* don't export user IFS ... */
 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */
shadow: Update to 4.1.5.1 Fixes CVE-2005-4890 and CVE-2011-0721. 2012-07-25 23:30:01 +02:00			`diff -ru shadow-4.1.5.1-orig/src/su.c shadow-4.1.5.1/src/su.c`
			`--- shadow-4.1.5.1-orig/src/su.c 2012-05-25 07:51:55.000000000 -0400`
			`+++ shadow-4.1.5.1/src/su.c 2012-07-25 17:22:57.013547930 -0400`
			`@@ -879,6 +879,7 @@`
			`}`
			`}`
* Apply a few patches to make `su' behave more like the old `su' from coreutils: - Don't remove variables such as $PATH and $SHELL from the calling environment (from upstream). - When su is invoked with command line arguments for the shell (e.g. "su - -c 'cmd'"), set argv[0] in the shell to "-su" or "-<basename>" (as determined by the SU_NAME option in /etc/login.defs). This is necessary to make Bash compiled with the NON_INTERACTIVE_LOGIN_SHELLS option to read startup files. - Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the caller. svn path=/nixpkgs/trunk/; revision=22140 2010-06-04 13:32:42 +02:00
			`+#if 0`
shadow: Update to 4.1.5.1 Fixes CVE-2005-4890 and CVE-2011-0721. 2012-07-25 23:30:01 +02:00			`cp = getdef_str ((pw->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");`
* Apply a few patches to make `su' behave more like the old `su' from coreutils: - Don't remove variables such as $PATH and $SHELL from the calling environment (from upstream). - When su is invoked with command line arguments for the shell (e.g. "su - -c 'cmd'"), set argv[0] in the shell to "-su" or "-<basename>" (as determined by the SU_NAME option in /etc/login.defs). This is necessary to make Bash compiled with the NON_INTERACTIVE_LOGIN_SHELLS option to read startup files. - Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the caller. svn path=/nixpkgs/trunk/; revision=22140 2010-06-04 13:32:42 +02:00			`if (NULL == cp) {`
shadow: Update to 4.1.5.1 Fixes CVE-2005-4890 and CVE-2011-0721. 2012-07-25 23:30:01 +02:00			`addenv ((pw->pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL);`
			`@@ -887,6 +888,7 @@`
* Apply a few patches to make `su' behave more like the old `su' from coreutils: - Don't remove variables such as $PATH and $SHELL from the calling environment (from upstream). - When su is invoked with command line arguments for the shell (e.g. "su - -c 'cmd'"), set argv[0] in the shell to "-su" or "-<basename>" (as determined by the SU_NAME option in /etc/login.defs). This is necessary to make Bash compiled with the NON_INTERACTIVE_LOGIN_SHELLS option to read startup files. - Don't set $PATH to /bin:/usr/bin but inherit the $PATH of the caller. svn path=/nixpkgs/trunk/; revision=22140 2010-06-04 13:32:42 +02:00			`} else {`
			`addenv ("PATH", cp);`
			`}`
			`+#endif`

			`if (getenv ("IFS") != NULL) { /* don't export user IFS ... */`
			`addenv ("IFS= \t\n", NULL); /* ... instead, set a safe IFS */`