3 files changed, 14 insertions, 10 deletions

diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index d43e1dac1..c51dcf927 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -643,14 +643,15 @@ int sandbox(void* sandbox_arg) {
         if (arg_noroot) {
                 int rv = unshare(CLONE_NEWUSER);
                 if (rv == -1) {
-                        fprintf(stderr, "Error: cannot mount a new user namespace\n");
+                        fprintf(stderr, "Warning: cannot mount a new user namespace, going forward without it\n");
                         perror("unshare");
                         drop_privs(arg_nogroups);
+                        arg_noroot = 0;
                 }
         }
         else
                 drop_privs(arg_nogroups);
-        
+        
         // notify parent that new user namespace has been created so a proper
         // UID/GID map can be setup
         notify_other(child_to_parent_fds[1]);
diff --git a/src/firejail/util.c b/src/firejail/util.c
index c62f4285c..04b564370 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -513,6 +513,9 @@ void wait_for_other(int fd) {
                 fprintf(stderr, "Error: cannot establish communication with the parent, exiting...\n");
                 exit(1);
         }
+        if (strcmp(childstr, "arg_noroot=0") == 0)
+                arg_noroot = 0;
+
         fclose(stream);
 }
 
@@ -523,7 +526,7 @@ void notify_other(int fd) {
         if (newfd == -1)
                 errExit("dup");
         stream = fdopen(newfd, "w");
-        fprintf(stream, "%u\n", getpid());
+        fprintf(stream, "arg_noroot=%d\n", arg_noroot);
         fflush(stream);
         fclose(stream);
 }
diff --git a/test/test.sh b/test/test.sh
index 0ef816717..cb3cd728a 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -61,7 +61,7 @@ echo "TESTING: version (option_version.exp)"
 echo "TESTING: help (option_help.exp)"
 ./option_help.exp
 
-echo "TESTING: man (opton_man.exp)"
+echo "TESTING: man (option_man.exp)"
 ./option_man.exp
 
 echo "TESTING: list (option_list.exp)"
@@ -105,13 +105,13 @@ echo "TESTING: rlimit (option_rlimit.exp)"
 echo "TESTING: shutdown (option_shutdown.exp)"
 ./option-shutdown.exp
 
-echo "TESTING: join (opton-join.exp)"
+echo "TESTING: join (option-join.exp)"
 ./option-join.exp
 
-echo "TESTING: join2 (opton-join2.exp)"
+echo "TESTING: join2 (option-join2.exp)"
 ./option-join2.exp
 
-echo "TESTING: join3 (opton-join3.exp)"
+echo "TESTING: join3 (option-join3.exp)"
 ./option-join3.exp
 
 echo "TESTING: join profile (option-join-profile.exp)"
@@ -123,13 +123,13 @@ echo "TESTING: firejail in firejail - single sandbox (firejail-in-firejail.exp)"
 echo "TESTING: firejail in firejail - force new sandbox (firejail-in-firejail2.exp)"
 ./firejail-in-firejail2.exp
 
-echo "TESTING: chroot overlay (opton_chroot_overlay.exp)"
+echo "TESTING: chroot overlay (option_chroot_overlay.exp)"
 ./option_chroot_overlay.exp
 
 echo "TESTING: blacklist directory (option_blacklist.exp)"
 ./option_blacklist.exp
 
-echo "TESTING: blacklist file (opton_blacklist_file.exp)"
+echo "TESTING: blacklist file (opiton_blacklist_file.exp)"
 ./option_blacklist_file.exp
 
 echo "TESTING: bind as user (option_bind_user.exp)"
@@ -137,7 +137,7 @@ echo "TESTING: bind as user (option_bind_user.exp)"
 
 if [ -d /home/bingo ];
 then
-        echo "TESTING: home sanitize (opton_version.exp)"
+        echo "TESTING: home sanitize (opiton_version.exp)"
         ./option_version.exp
 fi