From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 12 Jul 2010 19:49:08 +0000 (-0400)
Subject: Use _PATH_STDPATH instead of _PATH_DEFPATH
X-Git-Tag: SUDO_1_7_4~104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ce2bd3a6d53e83f7c5c3b7387a16203669be74c;p=sudo

Use _PATH_STDPATH instead of _PATH_DEFPATH

--HG--
branch : 1.7
---

diff --git a/env.c b/env.c
index 8eb8e1ad6..cb06e2376 100644
--- a/env.c
+++ b/env.c
@@ -751,7 +751,7 @@ rebuild_env(noexec)
     if (!ISSET(didvar, DID_TERM))
 	sudo_putenv("TERM=unknown", FALSE, FALSE);
     if (!ISSET(didvar, DID_PATH))
-	sudo_setenv("PATH", _PATH_DEFPATH, FALSE);
+	sudo_setenv("PATH", _PATH_STDPATH, FALSE);
 
     /*
      * Preload a noexec file?  For a list of LD_PRELOAD-alikes, see
diff --git a/logging.c b/logging.c
index 1d4acc5c6..3f1d85564 100644
--- a/logging.c
+++ b/logging.c
@@ -431,7 +431,7 @@ send_mail(fmt, va_alist)
 #ifndef NO_ROOT_MAILER
     static char *root_envp[] = {
 	"HOME=/",
-	"PATH=/usr/bin:/bin",
+	"PATH=/usr/bin:/bin:/usr/sbin:/sbin",
 	"LOGNAME=root",
 	"USERNAME=root",
 	"USER=root",
diff --git a/pathnames.h.in b/pathnames.h.in
index 32f68f8ce..b3bd537ed 100644
--- a/pathnames.h.in
+++ b/pathnames.h.in
@@ -43,6 +43,10 @@
 #define _PATH_DEFPATH		"/usr/bin:/bin"
 #endif /* _PATH_DEFPATH */
 
+#ifndef _PATH_STDPATH
+#define _PATH_STDPATH		"/usr/bin:/bin:/usr/sbin:/sbin"
+#endif /* _PATH_STDPATH */
+
 #ifndef _PATH_ENVIRONMENT
 #define _PATH_ENVIRONMENT	"/etc/environment"
 #endif /* _PATH_ENVIRONMENT */