aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-05-20 07:59:22 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-05-20 07:59:22 -0400
commitcecd43784290fba972b2b1aa732d0f8531b8b846 (patch)
tree181058acc615bfe6875a2da196c4537ca2a53b68
parentfixes (diff)
downloadfirejail-cecd43784290fba972b2b1aa732d0f8531b8b846.tar.gz
firejail-cecd43784290fba972b2b1aa732d0f8531b8b846.tar.zst
firejail-cecd43784290fba972b2b1aa732d0f8531b8b846.zip
fixes
-rw-r--r--src/man/firejail.txt2
-rwxr-xr-xtest/filters/noroot.exp1
-rwxr-xr-xtest/filters/protocol.exp2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index e3a660286..2ea15ff2b 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1138,7 +1138,7 @@ A short note about mixing \-\-whitelist and \-\-read-only options. Whitelisted d
1138should be made read-only independently. Making a parent directory read-only, will not 1138should be made read-only independently. Making a parent directory read-only, will not
1139make the whitelist read-only. Example: 1139make the whitelist read-only. Example:
1140.br 1140.br
1141$ firejail --whitelist=~/work --read-only=~/ --read-only=~/work 1141$ firejail --whitelist=~/work --read-only=~ --read-only=~/work
1142 1142
1143.TP 1143.TP
1144\fB\-\-rlimit-fsize=number 1144\fB\-\-rlimit-fsize=number
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp
index 7f4f189ee..bbd2291c8 100755
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -143,6 +143,7 @@ expect {
143 timeout {puts "TESTING ERROR 22\n";exit} 143 timeout {puts "TESTING ERROR 22\n";exit}
144 "effective uid is not 0, is sudo installed setuid root?" { puts "OK\n";} 144 "effective uid is not 0, is sudo installed setuid root?" { puts "OK\n";}
145 "sudo must be owned by uid 0 and have the setuid bit set" { puts "OK\n";} 145 "sudo must be owned by uid 0 and have the setuid bit set" { puts "OK\n";}
146 "Permission denied" { puts "OK\n";}
146} 147}
147send -- "cat /proc/self/uid_map | wc -l\r" 148send -- "cat /proc/self/uid_map | wc -l\r"
148expect { 149expect {
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp
index 10a13fe25..82e9a63eb 100755
--- a/test/filters/protocol.exp
+++ b/test/filters/protocol.exp
@@ -10,10 +10,12 @@ match_max 100000
10send -- "firejail --noprofile --protocol=unix ./syscall_test socket\r" 10send -- "firejail --noprofile --protocol=unix ./syscall_test socket\r"
11expect { 11expect {
12 timeout {puts "TESTING ERROR 1\n";exit} 12 timeout {puts "TESTING ERROR 1\n";exit}
13 "Permission denied" {puts "TESTING SKIP: permission denied\n"; exit}
13 "Child process initialized" 14 "Child process initialized"
14} 15}
15expect { 16expect {
16 timeout {puts "TESTING ERROR 1.1\n";exit} 17 timeout {puts "TESTING ERROR 1.1\n";exit}
18 "Permission denied" {puts "TESTING SKIP: permission denied\n"; exit}
17 "socket AF_INET" 19 "socket AF_INET"
18} 20}
19expect { 21expect {