diff options
-rw-r--r-- | etc/profile-m-z/ping.profile | 2 | ||||
-rw-r--r-- | src/firejail/fs.c | 5 | ||||
-rw-r--r-- | src/firejail/util.c | 1 | ||||
-rwxr-xr-x | test/sysutils/man.exp | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/etc/profile-m-z/ping.profile b/etc/profile-m-z/ping.profile index f5f28cadd..ddb8ff867 100644 --- a/etc/profile-m-z/ping.profile +++ b/etc/profile-m-z/ping.profile | |||
@@ -56,7 +56,7 @@ private | |||
56 | #private-bin ping - has mammoth problems with execvp: "No such file or directory" | 56 | #private-bin ping - has mammoth problems with execvp: "No such file or directory" |
57 | private-cache | 57 | private-cache |
58 | private-dev | 58 | private-dev |
59 | private-etc alternatives,ld.so.cache,ld.so.preload,ca-certificates,crypto-policies,hosts,login.defs,passwd,pki,resolv.conf,ssl | 59 | private-etc alternatives,ca-certificates,crypto-policies,hosts,ld.so.cache,ld.so.preload,login.defs,passwd,pki,resolv.conf,ssl |
60 | private-lib | 60 | private-lib |
61 | private-tmp | 61 | private-tmp |
62 | 62 | ||
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 84f207fac..74f7bddd9 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
@@ -67,11 +67,8 @@ static void disable_file(OPERATION op, const char *filename) { | |||
67 | // they don't seem to like a uid of 0 | 67 | // they don't seem to like a uid of 0 |
68 | // force mounting | 68 | // force mounting |
69 | int fd = open(filename, O_PATH|O_CLOEXEC); | 69 | int fd = open(filename, O_PATH|O_CLOEXEC); |
70 | if (fd < 0) { | 70 | if (fd < 0) |
71 | if (arg_debug) | ||
72 | printf("Warning (blacklisting): cannot open %s: %s\n", filename, strerror(errno)); | ||
73 | return; | 71 | return; |
74 | } | ||
75 | 72 | ||
76 | EUID_ROOT(); | 73 | EUID_ROOT(); |
77 | int err = bind_mount_path_to_fd(RUN_RO_DIR, fd); | 74 | int err = bind_mount_path_to_fd(RUN_RO_DIR, fd); |
diff --git a/src/firejail/util.c b/src/firejail/util.c index a01290cf2..b35225620 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -255,7 +255,6 @@ static void clean_supplementary_groups(gid_t gid) { | |||
255 | return; | 255 | return; |
256 | 256 | ||
257 | clean_all: | 257 | clean_all: |
258 | fwarning("cleaning all supplementary groups\n"); | ||
259 | if (setgroups(0, NULL) < 0) | 258 | if (setgroups(0, NULL) < 0) |
260 | errExit("setgroups"); | 259 | errExit("setgroups"); |
261 | } | 260 | } |
diff --git a/test/sysutils/man.exp b/test/sysutils/man.exp index 6e0fb5584..e5dd83522 100755 --- a/test/sysutils/man.exp +++ b/test/sysutils/man.exp | |||
@@ -7,7 +7,7 @@ set timeout 10 | |||
7 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
8 | match_max 100000 | 8 | match_max 100000 |
9 | 9 | ||
10 | send -- "firejail man ls\r" | 10 | send -- "firejail man firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "NAME" | 13 | "NAME" |