aboutsummaryrefslogtreecommitdiff
path: root/include/paths.h
diff options
context:
space:
mode:
authorJilles Tjoelker <jilles@FreeBSD.org>2016-01-05 16:21:20 +0000
committerJilles Tjoelker <jilles@FreeBSD.org>2016-01-05 16:21:20 +0000
commit43d53dba8ff97ef82be216178626c3b545cce30f (patch)
tree1d6df1e16925bef49c86dc9b9398f394e582272b /include/paths.h
parent16ef2e1a9be003d7177ac978b039725256cd7fee (diff)
downloadsrc-43d53dba8ff97ef82be216178626c3b545cce30f.tar.gz
src-43d53dba8ff97ef82be216178626c3b545cce30f.zip
Add sbin and /usr/local directories to _PATH_DEFPATH.
Set _PATH_DEFPATH to /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin. This is the path in the default class in the default /etc/login.conf, excluding ~/bin which would not be expanded properly in a string constant. For normal logins, _PATH_DEFPATH is overridden by /etc/login.conf, ~/.login_conf or shell startup files. _PATH_DEFPATH is still used as a default by execlp(), execvp(), posix_spawnp() and sh if PATH is not set, and by cron. Especially the latter is a common trap (most recently in PR 204813). PR: 204813 Reviewed by: secteam (delphij), alfred
Notes
Notes: svn path=/head/; revision=293204
Diffstat (limited to 'include/paths.h')
-rw-r--r--include/paths.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/paths.h b/include/paths.h
index 89c9fc9cf04c..af18c26e2b2c 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
/* Default search path. */
-#define _PATH_DEFPATH "/usr/bin:/bin"
+#define _PATH_DEFPATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
/* All standard utilities path. */
#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
/* Locate system binaries. */
@@ -108,7 +108,7 @@ __END_DECLS
#ifdef RESCUE
#undef _PATH_DEFPATH
-#define _PATH_DEFPATH "/rescue:/usr/bin:/bin"
+#define _PATH_DEFPATH "/rescue:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
#undef _PATH_STDPATH
#define _PATH_STDPATH "/rescue:/usr/bin:/bin:/usr/sbin:/sbin"
#undef _PATH_SYSPATH