mailine merge: Fix check for nobody user, tests: skip tests checking for /dev/kmsg which might not be available

3 files changed, 9 insertions, 4 deletions

diff --git a/src/lib/firejail_user.c b/src/lib/firejail_user.c
index b0f56a19a..b270db459 100644
--- a/src/lib/firejail_user.c
+++ b/src/lib/firejail_user.c
@@ -108,7 +108,7 @@ int firejail_user_check(const char *name) {
                 return 1;
 
         // user nobody is never allowed
-        if (strcmp(name, "root") == 0)
+        if (strcmp(name, "nobody") == 0)
                 return 0;
 
         // check file existence
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index b4d2cf9c2..28c7338e3 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -23,7 +23,12 @@ echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)"
 ./sys_fs.exp
 
 echo "TESTING: kmsg access (test/fs/kmsg.exp)"
-./kmsg.exp
+if [ -c /dev/kmsg ]; then
+        echo "TESTING: kmsg access (test/fs/kmsg.exp)"
+        ./kmsg.exp
+else
+        echo "TESTING SKIP: /dev/kmsg not available"
+fi
 
 echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)"
 ./fs_var_tmp.exp
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp
index 450945b66..21f6f68ff 100755
--- a/test/utils/fs-print.exp
+++ b/test/utils/fs-print.exp
@@ -22,11 +22,11 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "blacklist /dev/kmsg"
+        "blacklist /proc/kmsg"
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "blacklist /proc/kmsg"
+        "blacklist /bin/su"
 }
 after 100
 puts "\nall done\n"