aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2023-01-19 01:35:40 -0500
committerLibravatar netblue30 <netblue30@protonmail.com>2023-01-19 01:35:40 -0500
commite4f1c107d039de738c27de9e936589a4821883a3 (patch)
tree28f6e98ea8e691ca14a2253538d5c116cef60d03
parentcleanup (diff)
downloadfirejail-e4f1c107d039de738c27de9e936589a4821883a3.tar.gz
firejail-e4f1c107d039de738c27de9e936589a4821883a3.tar.zst
firejail-e4f1c107d039de738c27de9e936589a4821883a3.zip
cleanup
-rw-r--r--etc/profile-m-z/ping.profile2
-rw-r--r--src/firejail/fs.c5
-rw-r--r--src/firejail/util.c1
-rwxr-xr-xtest/sysutils/man.exp2
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"
57private-cache 57private-cache
58private-dev 58private-dev
59private-etc alternatives,ld.so.cache,ld.so.preload,ca-certificates,crypto-policies,hosts,login.defs,passwd,pki,resolv.conf,ssl 59private-etc alternatives,ca-certificates,crypto-policies,hosts,ld.so.cache,ld.so.preload,login.defs,passwd,pki,resolv.conf,ssl
60private-lib 60private-lib
61private-tmp 61private-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
257clean_all: 257clean_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
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
10send -- "firejail man ls\r" 10send -- "firejail man firejail\r"
11expect { 11expect {
12 timeout {puts "TESTING ERROR 0\n";exit} 12 timeout {puts "TESTING ERROR 0\n";exit}
13 "NAME" 13 "NAME"