fixes

4 files changed, 63 insertions, 5 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 545c38018..b25bad9f2 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -774,7 +774,7 @@ static int check_arg(int argc, char **argv, const char *argument) {
         int i;
         int found = 0;
         for (i = 1; i < argc; i++) {
-                if (strcmp(argv[i], "--force") == 0) {
+                if (strcmp(argv[i], argument) == 0) {
                         found = 1;
                         break;
                 }
@@ -833,6 +833,11 @@ int main(int argc, char **argv) {
                         if (check_arg(argc, argv, "--force"))
                                 option_force = 1;
                         else {
+                                if (check_arg(argc, argv, "--version")) {
+                                        printf("firejail version %s\n", VERSION);
+                                        exit(0);
+                                }
+                                
                                 // start the program directly without sandboxing
                                 run_no_sandbox(argc, argv);
                                 // it will never get here!
@@ -840,12 +845,12 @@ int main(int argc, char **argv) {
                         }
                 }
         }
-        
+
         // check root/suid
         EUID_ROOT();
         if (geteuid()) {
                 // only --version is supported without SUID support
-                if (check_arg(argc, argv, "--force")) {
+                if (check_arg(argc, argv, "--version")) {
                         printf("firejail version %s\n", VERSION);
                         exit(0);
                 }
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index 07ac25dca..c56d90994 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -229,5 +229,6 @@ void run_no_sandbox(int argc, char **argv) {
                 fprintf(stderr, "Warning: an existing sandbox was detected. "
                         "%s will run without any additional sandboxing features\n", command);
 
+        arg_quiet = 1;
         start_application();
 }
diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp
index 1122b712f..2b851ee72 100755
--- a/test/environment/firejail-in-firejail.exp
+++ b/test/environment/firejail-in-firejail.exp
@@ -16,9 +16,34 @@ sleep 1
 
 send --  "firejail\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
         "Warning: an existing sandbox was detected"
 }
 after 100
 
+send --  "exit\r"
+after 100
+
+send --  "firejail --force\r"
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "cannot rise privileges"
+}
+after 100
+
+send --  "firejail --version\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "firejail version"
+}
+after 100
+
+send --  "firejail --version --force\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "firejail version"
+}
+after 100
+
+
 puts "\nall done\n"
diff --git a/test/environment/firejail-in-firejail2.exp b/test/environment/firejail-in-firejail2.exp
index 37d1c2870..330e5e372 100755
--- a/test/environment/firejail-in-firejail2.exp
+++ b/test/environment/firejail-in-firejail2.exp
@@ -14,11 +14,38 @@ expect {
 }
 sleep 1
 
+send --  "firejail\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "Warning: an existing sandbox was detected"
+}
+after 100
+
+send --  "exit\r"
+after 100
+
 send --  "firejail --force\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "Child process initialized"
 }
 after 100
 
+send --  "exit\r"
+after 100
+
+send --  "firejail --version\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "firejail version"
+}
+after 100
+
+send --  "firejail --version --force\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "firejail version"
+}
+after 100
+
 puts "\nall done\n"