ssh fixes

2 files changed, 4 insertions, 3 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 3e5663a9b..c6c1bc866 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -892,7 +892,7 @@ if (fp) {
 EUID_USER();
 #endif
                                 
-                                // run sftp and ssh directly without any sandboxing
+                                // run sftp and scp directly without any sandboxing
                                 // regular login has argv[0] == "-firejail"
                                 if (*argv[0] != '-') {
                                         if (strcmp(argv[1], "-c") == 0 && argc > 2) {
@@ -910,7 +910,8 @@ EUID_USER();
         
         // is this a login shell, or a command passed by sshd, insert command line options from /etc/firejail/login.users
         if (*argv[0] == '-' || parent_sshd) {
-                login_shell = 1;
+                if (argc == 1)
+                        login_shell = 1;
                 fullargc = restricted_shell(cfg.username);
                 if (fullargc) {
                         int j;
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 6b3d5ea89..8178cfc8e 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -331,7 +331,7 @@ static void start_application(void) {
                 char *arg[5];
                 int index = 0;
                 arg[index++] = cfg.shell;
-                if (login_shell && cfg.shell == cfg.command_line) {
+                if (login_shell) {
                         arg[index++] = "-l";
                         if (arg_debug)
                                 printf("Starting %s login shell\n", cfg.shell);