Merge pull request #427 from avoidr/paths_fix

Paths fix

3 files changed, 5 insertions, 4 deletions

diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 4695d8d26..b4eb708d8 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -501,12 +501,12 @@ void fs_blacklist(void) {
                 char *new_name = expand_home(ptr, homedir);
                 ptr = new_name;
 
-                // expand path macro - look for the file in /bin, /usr/bin, /sbin and  /usr/sbin directories
+                // expand path macro - look for the file in /usr/local/bin, /bin, /usr/bin, /sbin and  /usr/sbin directories
                 if (ptr) {
                         if (strncmp(ptr, "${PATH}", 7) == 0) {
                                 char *fname = ptr + 7;
                                 size_t fname_len = strlen(fname);
-                                char **paths = build_paths(); //{"/bin", "/sbin", "/usr/bin", "/usr/sbin", NULL};
+                                char **paths = build_paths(); //{"/usr/local/bin", "/bin", "/usr/bin/", "/sbin", "/usr/sbin", NULL};
                                 int i = 0;
                                 while (paths[i] != NULL) {
                                         char *path = paths[i];
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index fe1ac9243..87d63c6e6 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -227,7 +227,7 @@ void fs_private_bin_list(void) {
         // wait for the child to finish
         waitpid(child, NULL, 0);
 
-        // moun-bind
+        // mount-bind
         i = 0;
         while (paths[i]) {
                 if (arg_debug)
diff --git a/src/firejail/paths.c b/src/firejail/paths.c
index 3d4b8cd8e..74b8dfe55 100644
--- a/src/firejail/paths.c
+++ b/src/firejail/paths.c
@@ -75,9 +75,10 @@ char **build_paths(void) {
                 memset(paths, 0, sizeof(char *) * cnt);
 
                 // add default paths
+                add_path("/usr/local/bin");
                 add_path("/bin");
-                add_path("/sbin");
                 add_path("/usr/bin");
+                add_path("/sbin");
                 add_path("/usr/sbin");
 
                 path2 = strdup(path1);