[Pkg-shadow-commits] r1501 - in upstream/trunk: . libmisc man

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-26 23:15:43 +0000 (Wed, 26 Dec 2007)
New Revision: 1501

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/libmisc/setupenv.c
   upstream/trunk/man/login.1.xml
Log:
Merge Debian's patch 451_login_PATH
	* NEWS, libmisc/setupenv.c: Export PATH according to ENV_PATH and
	ENV_SUPATH, as for su. This impacts login.
	* man/login.1.xml: PATH and SUPATH are now used both when PAM support
	is disabled and enabled.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-26 22:36:54 UTC (rev 1500)
+++ upstream/trunk/ChangeLog	2007-12-26 23:15:43 UTC (rev 1501)
@@ -1,5 +1,11 @@
 2007-12-26  Nicolas François  <nicolas.francois at centraliens.net>
 
+	Merge Debian's patch 451_login_PATH
+	* NEWS, libmisc/setupenv.c: Export PATH according to ENV_PATH and
+	ENV_SUPATH, as for su. This impacts login.
+
+2007-12-26  Nicolas François  <nicolas.francois at centraliens.net>
+
 	Merge Debian's patch 496_login_init_session
 	* src/login.c, src/sulogin.c: If started as init, start a new session.
 

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2007-12-26 22:36:54 UTC (rev 1500)
+++ upstream/trunk/NEWS	2007-12-26 23:15:43 UTC (rev 1501)
@@ -22,6 +22,9 @@
   * If started as init, start a new session.
 - sulogin
   * If started as init, start a new session.
+- login
+  * Use PATH and SUPATH to set the PATH environment variable, even when
+    support for PAM is enabled.
 
 shadow-4.0.18.2 -> shadow-4.1.0						09-12-2008
 

Modified: upstream/trunk/libmisc/setupenv.c
===================================================================
--- upstream/trunk/libmisc/setupenv.c	2007-12-26 22:36:54 UTC (rev 1500)
+++ upstream/trunk/libmisc/setupenv.c	2007-12-26 23:15:43 UTC (rev 1501)
@@ -186,8 +186,8 @@
 {
 #ifndef USE_PAM
 	char *envf;
+#endif
 	char *cp;
-#endif
 
 	/*
 	 * Change the current working directory to be the home directory
@@ -242,7 +242,6 @@
 	addenv ("USER", info->pw_name);
 	addenv ("LOGNAME", info->pw_name);
 
-#ifndef USE_PAM
 	/*
 	 * Create the PATH environmental variable and export it.
 	 */
@@ -260,6 +259,7 @@
 		addenv ("PATH", cp);
 	}
 
+#ifndef USE_PAM
 	/*
 	 * Create the MAIL environmental variable and export it.  login.defs
 	 * knows the prefix.

Modified: upstream/trunk/man/login.1.xml
===================================================================
--- upstream/trunk/man/login.1.xml	2007-12-26 22:36:54 UTC (rev 1500)
+++ upstream/trunk/man/login.1.xml	2007-12-26 23:15:43 UTC (rev 1501)
@@ -242,8 +242,8 @@
       &CONSOLE_GROUPS;
       &DEFAULT_HOME;
       <phrase condition="no_pam">&ENV_HZ;</phrase>
-      <phrase condition="no_pam">&ENV_PATH;</phrase>
-      <phrase condition="no_pam">&ENV_SUPATH;</phrase>
+      <phrase>&ENV_PATH;</phrase>
+      <phrase>&ENV_SUPATH;</phrase>
       &ENV_TZ;
       &ENVIRON_FILE;
       &ERASECHAR;