From 91e2867eaf93ad6cfdbbcc569efec464fad2005c Mon Sep 17 00:00:00 2001 From: netblue30 Date: Fri, 13 Apr 2018 10:30:28 -0400 Subject: fix problem found by smitsohu --- src/firejail/sandbox.c | 7 ------- src/firejail/sbox.c | 14 -------------- src/firejail/x11.c | 18 ------------------ 3 files changed, 39 deletions(-) (limited to 'src') diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 5c7f73fc1..e0cecda1b 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c @@ -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 //**************************************** diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c index cc2b08542..53df20a54 100644 --- a/src/firejail/sbox.c +++ b/src/firejail/sbox.c @@ -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; } diff --git a/src/firejail/x11.c b/src/firejail/x11.c index 3903b4709..7040dea18 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c @@ -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 }; -- cgit v1.2.3-54-g00ecf