5 files changed, 12 insertions, 42 deletions

diff --git a/src/firejail/env.c b/src/firejail/env.c
index 963288459..548e8102d 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -119,7 +119,7 @@ void env_defaults(void) {
 //      env_store_name_val("MOZ_NO_REMOTE, "1", SETENV);
         env_store_name_val("container", "firejail", SETENV); // LXC sets container=lxc,
         if (!cfg.shell)
-                cfg.shell = guess_shell();
+                cfg.shell = cfg.usershell;
         if (cfg.shell)
                 env_store_name_val("SHELL", cfg.shell, SETENV);
 
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 19cbacc01..325524379 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -154,6 +154,7 @@ typedef struct config_t {
         // user data
         char *username;
         char *homedir;
+        char *usershell;
 
         // filesystem
         ProfileEntry *profile;
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 8bfff4e68..2a68dc806 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -245,6 +245,9 @@ static void init_cfg(int argc, char **argv) {
         cfg.username = strdup(pw->pw_name);
         if (!cfg.username)
                 errExit("strdup");
+        cfg.usershell = strdup(pw->pw_shell);
+        if (!cfg.usershell)
+                errExit("strdup");
 
         // check user database
         if (!firejail_user_check(cfg.username)) {
@@ -801,7 +804,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                         }
 
                         if (!cfg.shell && !arg_shell_none)
-                                cfg.shell = guess_shell();
+                                cfg.shell = cfg.usershell;
 
                         // join sandbox by pid or by name
                         pid_t pid = require_pid(argv[i] + 7);
@@ -830,7 +833,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                         pid_t pid;
                         if (!read_pid(argv[i] + 16, &pid)) {
                                 if (!cfg.shell && !arg_shell_none)
-                                        cfg.shell = guess_shell();
+                                        cfg.shell = cfg.usershell;
 
                                 join(pid, argc, argv, i + 1);
                                 exit(0);
@@ -851,7 +854,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                         }
 
                         if (!cfg.shell && !arg_shell_none)
-                                cfg.shell = guess_shell();
+                                cfg.shell = cfg.usershell;
 
                         // join sandbox by pid or by name
                         pid_t pid = require_pid(argv[i] + 15);
@@ -871,7 +874,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                 }
 
                 if (!cfg.shell && !arg_shell_none)
-                        cfg.shell = guess_shell();
+                        cfg.shell = cfg.usershell;
 
                 // join sandbox by pid or by name
                 pid_t pid = require_pid(argv[i] + 18);
@@ -889,40 +892,6 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
 
 }
 
-char *guess_shell(void) {
-        const char *shell;
-        char *retval;
-
-        shell = env_get("SHELL");
-        if (shell) {
-                invalid_filename(shell, 0); // no globbing
-                if (access(shell, X_OK) == 0 && !is_dir(shell) && strstr(shell, "..") == NULL &&
-                    strcmp(gnu_basename(shell), "firejail") != 0)
-                        goto found;
-        }
-
-        // shells in order of preference
-        static const char * const shells[] = {"/bin/bash", "/bin/csh", "/usr/bin/zsh", "/bin/sh", "/bin/ash", NULL };
-
-        int i = 0;
-        while (shells[i] != NULL) {
-                // access call checks as real UID/GID, not as effective UID/GID
-                if (access(shells[i], X_OK) == 0) {
-                        shell = shells[i];
-                        goto found;
-                }
-                i++;
-        }
-
-        return NULL;
-
- found:
-        retval = strdup(shell);
-        if (!retval)
-                errExit("strdup");
-        return retval;
-}
-
 // return argument index
 static int check_arg(int argc, char **argv, const char *argument, int strict) {
         int i;
@@ -2901,7 +2870,7 @@ int main(int argc, char **argv, char **envp) {
 
         // guess shell if unspecified
         if (!arg_shell_none && !cfg.shell) {
-                cfg.shell = guess_shell();
+                cfg.shell = cfg.usershell;
                 if (!cfg.shell) {
                         fprintf(stderr, "Error: unable to guess your shell, please set explicitly by using --shell option.\n");
                         exit(1);
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index c57d397ef..62b701c4d 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -190,7 +190,7 @@ void run_no_sandbox(int argc, char **argv) {
 
         if (prog_index == 0) {
                 // got no command, require a shell and try to execute it
-                cfg.shell = guess_shell();
+                cfg.shell = cfg.usershell;
                 if (!cfg.shell) {
                         fprintf(stderr, "Error: unable to guess your shell, please set SHELL environment variable\n");
                         exit(1);
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index daa0a2e92..3a4d74317 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1562,7 +1562,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                         EUID_USER();
                         if (!r) {
                                 if (!cfg.shell && !arg_shell_none)
-                                        cfg.shell = guess_shell();
+                                        cfg.shell = cfg.usershell;
 
                                 // find first non-option arg
                                 int i;