mirror of
https://github.com/netblue30/firejail.git
synced 2026-05-21 06:45:29 -06:00
fix problem found by smitsohu
This commit is contained in:
parent
d5b3b13b66
commit
91e2867eaf
3 changed files with 0 additions and 39 deletions
|
|
@ -1035,13 +1035,6 @@ int sandbox(void* sandbox_arg) {
|
|||
int rv = unlink(RUN_SECCOMP_MDWX);
|
||||
(void) rv;
|
||||
}
|
||||
|
||||
if (arg_debug) {
|
||||
printf("\nSeccomp files:\n");
|
||||
int rv = system("ls -l /run/firejail/mnt/seccomp*\n");
|
||||
(void) rv;
|
||||
printf("\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
//****************************************
|
||||
|
|
|
|||
|
|
@ -153,13 +153,6 @@ int sbox_run(unsigned filter, int num, ...) {
|
|||
for (i = 3; i < max; i++)
|
||||
close(i); // close open files
|
||||
|
||||
#if 0
|
||||
if (arg_debug) {
|
||||
printf("sbox file descriptors:\n");
|
||||
int rv = system("ls -l /proc/self/fd");
|
||||
(void) rv;
|
||||
}
|
||||
#endif
|
||||
umask(027);
|
||||
|
||||
// apply filters
|
||||
|
|
@ -216,12 +209,5 @@ int sbox_run(unsigned filter, int num, ...) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
#if 0
|
||||
printf("** sbox run out *********************************\n");
|
||||
system("ls -l /run/firejail/mnt\n");
|
||||
system("ls -l /proc/self/fd");
|
||||
printf("** sbox run out *********************************\n");
|
||||
#endif
|
||||
|
||||
return status;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -347,12 +347,6 @@ void x11_start_xvfb(int argc, char **argv) {
|
|||
}
|
||||
free(fname);
|
||||
|
||||
if (arg_debug) {
|
||||
printf("X11 sockets: "); fflush(0);
|
||||
int rv = system("ls /tmp/.X11-unix");
|
||||
(void) rv;
|
||||
}
|
||||
|
||||
assert(display_str);
|
||||
setenv("DISPLAY", display_str, 1);
|
||||
// run attach command
|
||||
|
|
@ -582,12 +576,6 @@ void x11_start_xephyr(int argc, char **argv) {
|
|||
}
|
||||
free(fname);
|
||||
|
||||
if (arg_debug) {
|
||||
printf("X11 sockets: "); fflush(0);
|
||||
int rv = system("ls /tmp/.X11-unix");
|
||||
(void) rv;
|
||||
}
|
||||
|
||||
assert(display_str);
|
||||
setenv("DISPLAY", display_str, 1);
|
||||
// run attach command
|
||||
|
|
@ -755,12 +743,6 @@ void x11_start_xpra_old(int argc, char **argv, int display, char *display_str) {
|
|||
}
|
||||
free(fname);
|
||||
|
||||
if (arg_debug) {
|
||||
printf("X11 sockets: "); fflush(0);
|
||||
int rv = system("ls /tmp/.X11-unix");
|
||||
(void) rv;
|
||||
}
|
||||
|
||||
// build attach command
|
||||
char *attach_argv[] = { "xpra", "--title=\"firejail x11 sandbox\"", "attach", display_str, NULL };
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue