From: Jim Meyering <jim@meyering.net>
Date: Thu, 19 Dec 1996 04:20:53 +0000 (+0000)
Subject: [HAVE_PATHS_H]: Include <paths.h>.
X-Git-Tag: v2.22-rc1~347^2~10^2~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c0a603f0cead69d3766f58478dde18bf8b3df6c;p=thirdparty%2Futil-linux.git

[HAVE_PATHS_H]: Include <paths.h>.
[_PATH_DEFPATH]: Use this to define DEFAULT_LOGIN_PATH.
[_PATH_DEFPATH_ROOT]: Use this to define DEFAULT_ROOT_LOGIN_PATH.
From Rik Faith.
---

diff --git a/login-utils/su.c b/login-utils/su.c
index 6399d7cf86..51e2e8165f 100644
--- a/login-utils/su.c
+++ b/login-utils/su.c
@@ -114,11 +114,23 @@ uid_t getuid ();
 
 #include "error.h"
 
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+
 /* The default PATH for simulated logins to non-superuser accounts.  */
+#ifdef _PATH_DEFPATH
+#define DEFAULT_LOGIN_PATH _PATH_DEFPATH
+#else
 #define DEFAULT_LOGIN_PATH ":/usr/ucb:/bin:/usr/bin"
+#endif
 
 /* The default PATH for simulated logins to superuser accounts.  */
+#ifdef _PATH_DEFPATH_ROOT
+#define DEFAULT_ROOT_LOGIN_PATH _PATH_DEFPATH_ROOT
+#else
 #define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc"
+#endif
 
 /* The shell to run if none is given in the user's passwd entry.  */
 #define DEFAULT_SHELL "/bin/sh"