SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove /sbin from paths if split-bin is false (#8324)

Browse Source 
Follow-up for 157baa87e4.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-03-01 21:48:36 +01:00
committed by Lennart Poettering
parent 7df4b832d0
commit 671f0f8de0
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-path/sd-path.c
+9 -6
View File
@@ -478,6 +478,12 @@ static int search_from_environment(
return 0;
}
#if HAVE_SPLIT_BIN
# define ARRAY_SBIN_BIN(x) x "sbin", x "bin"
#else
# define ARRAY_SBIN_BIN(x) x "bin"
#endif
static int get_search(uint64_t type, char ***list) {
assert(list);
@@ -490,13 +496,10 @@ static int get_search(uint64_t type, char ***list) {
".local/bin",
"PATH",
true,
"/usr/local/sbin",
"/usr/local/bin",
"/usr/sbin",
"/usr/bin",
ARRAY_SBIN_BIN("/usr/local/"),
ARRAY_SBIN_BIN("/usr/"),
#if HAVE_SPLIT_USR
"/sbin",
"/bin",
ARRAY_SBIN_BIN("/"),
#endif
NULL);