aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-05-07 10:49:07 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-05-07 10:49:07 -0400
commit03e03b26c144b385fbe2dc2996882e1bb21e5f76 (patch)
treea051675f871ffc726533b1e1c310e47999b48b9f /src
parentfix private-etc empty list (diff)
downloadfirejail-03e03b26c144b385fbe2dc2996882e1bb21e5f76.tar.gz
firejail-03e03b26c144b385fbe2dc2996882e1bb21e5f76.tar.zst
firejail-03e03b26c144b385fbe2dc2996882e1bb21e5f76.zip
fixed empty private-bin
Diffstat (limited to 'src')
-rw-r--r--src/firejail/fs_bin.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index c3d24aaac..8ac9d4f3f 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -108,10 +108,10 @@ void fs_check_bin_list(void) {
108 } 108 }
109 109
110 if (*newlist == '\0') { 110 if (*newlist == '\0') {
111 fprintf(stderr, "Warning: no --private-bin list executable found, option disabled\n"); 111// fprintf(stderr, "Warning: no --private-bin list executable found, option disabled\n");
112 cfg.bin_private_keep = NULL; 112// cfg.bin_private_keep = NULL;
113 arg_private_bin = 0; 113// arg_private_bin = 0;
114 free(newlist); 114// free(newlist);
115 } 115 }
116 else { 116 else {
117 ptr = strrchr(newlist, ','); 117 ptr = strrchr(newlist, ',');
@@ -172,19 +172,6 @@ void fs_private_bin_list(void) {
172 char *private_list = cfg.bin_private_keep; 172 char *private_list = cfg.bin_private_keep;
173 assert(private_list); 173 assert(private_list);
174 174
175 // check bin paths
176 int i = 0;
177#if 0
178 while (paths[i]) {
179 struct stat s;
180 if (stat(paths[i], &s) == -1) {
181 fprintf(stderr, "Error: cannot find %s directory\n", paths[i]);
182 exit(1);
183 }
184 i++;
185 }
186#endif
187
188 // create /tmp/firejail/mnt/bin directory 175 // create /tmp/firejail/mnt/bin directory
189 fs_build_mnt_dir(); 176 fs_build_mnt_dir();
190 int rv = mkdir(RUN_BIN_DIR, 0755); 177 int rv = mkdir(RUN_BIN_DIR, 0755);
@@ -231,7 +218,7 @@ void fs_private_bin_list(void) {
231 waitpid(child, NULL, 0); 218 waitpid(child, NULL, 0);
232 219
233 // mount-bind 220 // mount-bind
234 i = 0; 221 int i = 0;
235 while (paths[i]) { 222 while (paths[i]) {
236 struct stat s; 223 struct stat s;
237 if (stat(paths[i], &s) == 0) { 224 if (stat(paths[i], &s) == 0) {