[Pkg-shadow-commits] r3085 - in upstream/trunk: . libmisc man/login.defs.d

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-11-01 16:59:48 +0000 (Sun, 01 Nov 2009)
New Revision: 3085

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/libmisc/setupenv.c
   upstream/trunk/man/login.defs.d/ENV_SUPATH.xml
Log:
	* NEWS, man/login.defs.d/ENV_SUPATH.xml, libmisc/setupenv.c:
	Harmonize other paths and documentation with previous
	change.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-11-01 16:57:59 UTC (rev 3084)
+++ upstream/trunk/ChangeLog	2009-11-01 16:59:48 UTC (rev 3085)
@@ -1,3 +1,9 @@
+2009-11-01  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* NEWS, man/login.defs.d/ENV_SUPATH.xml, libmisc/setupenv.c:
+	Harmonize other paths and documentation with previous
+	change.
+
 2009-11-01  Michel Hermier  <michel.hermier at gmail.com>
 
 	* src/su.c: Set the default ENV_SUPATH to

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2009-11-01 16:57:59 UTC (rev 3084)
+++ upstream/trunk/NEWS	2009-11-01 16:59:48 UTC (rev 3085)
@@ -11,6 +11,7 @@
   * When su receives a signal, wait for the child to terminate (after
     sending a SIGTERM), and kill it only if it did not terminate by itself.
     No delay will be enforced if the child cooperates.
+  * Default ENV_SUPATH is /sbin:/bin:/usr/sbin:/usr/bin
 
 *** translation
   * Updated Czech translation.

Modified: upstream/trunk/libmisc/setupenv.c
===================================================================
--- upstream/trunk/libmisc/setupenv.c	2009-11-01 16:57:59 UTC (rev 3084)
+++ upstream/trunk/libmisc/setupenv.c	2009-11-01 16:59:48 UTC (rev 3085)
@@ -265,7 +265,7 @@
 
 	if (NULL == cp) {
 		/* not specified, use a minimal default */
-		addenv ("PATH=/bin:/usr/bin", NULL);
+		addenv ((pwent.pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL);
 	} else if (strchr (cp, '=')) {
 		/* specified as name=value (PATH=...) */
 		addenv (cp, NULL);

Modified: upstream/trunk/man/login.defs.d/ENV_SUPATH.xml
===================================================================
--- upstream/trunk/man/login.defs.d/ENV_SUPATH.xml	2009-11-01 16:57:59 UTC (rev 3084)
+++ upstream/trunk/man/login.defs.d/ENV_SUPATH.xml	2009-11-01 16:59:48 UTC (rev 3085)
@@ -1,7 +1,7 @@
 <!--
    Copyright (c) 1991 - 1993, Julianne Frances Haugh
    Copyright (c) 1991 - 1993, Chip Rosenthal
-   Copyright (c) 2007 - 2008, Nicolas François
+   Copyright (c) 2007 - 2009, Nicolas François
    All rights reserved.
   
    Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,8 @@
       the superuser login. The value can be preceded by
       <replaceable>PATH=</replaceable>, or a colon separated list of paths
       (for example <replaceable>/sbin:/bin:/usr/sbin:/usr/bin</replaceable>).
-      The default value is <replaceable>PATH=/bin:/usr/bin</replaceable>.
+      The default value is
+      <replaceable>PATH=/sbin:/bin:/usr/sbin:/usr/bin</replaceable>.
     </para>
     <!-- TODO: it can in fact be used to set any other variable-->
   </listitem>