Use _PATH_STDPATH instead of _PATH_DEFPATH

diff --git a/pathnames.h.in b/pathnames.h.in
index d6eb6e4661a8d09a78e3f2a8783c81803c08d541..4e6cc078df0fcb3413f96d85fc1291ce21d9d5f9 100644 (file)
--- 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 */

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index 99ef0ff5777619fee287292804bfb2fd3fbabd79..c7562590c0bad67efe7753be73080941903bba10 100644 (file)
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -572,7 +572,7 @@ rebuild_env(int 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/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index 071c84cd56cda22e1e894eaa98aace6760ba0621..0cacc92cbd804ccc5b1bc610edc68c0e1d806f7e 100644 (file)
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -404,7 +404,7 @@ send_mail(const char *fmt, ...)
 #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",