aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/x11.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/firejail/x11.c')
-rw-r--r--src/firejail/x11.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 26af8ad35..d41f46d93 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -321,9 +321,6 @@ void x11_start_xvfb(int argc, char **argv) {
321 321
322 // running without privileges - see drop_privs call above 322 // running without privileges - see drop_privs call above
323 assert(getenv("LD_PRELOAD") == NULL); 323 assert(getenv("LD_PRELOAD") == NULL);
324#ifdef HAVE_SECCOMP
325 seccomp_install_filters();
326#endif
327 execvp(server_argv[0], server_argv); 324 execvp(server_argv[0], server_argv);
328 perror("execvp"); 325 perror("execvp");
329 _exit(1); 326 _exit(1);
@@ -368,9 +365,6 @@ void x11_start_xvfb(int argc, char **argv) {
368 365
369 // running without privileges - see drop_privs call above 366 // running without privileges - see drop_privs call above
370 assert(getenv("LD_PRELOAD") == NULL); 367 assert(getenv("LD_PRELOAD") == NULL);
371#ifdef HAVE_SECCOMP
372 seccomp_install_filters();
373#endif
374 execvp(jail_argv[0], jail_argv); 368 execvp(jail_argv[0], jail_argv);
375 perror("execvp"); 369 perror("execvp");
376 _exit(1); 370 _exit(1);
@@ -563,9 +557,6 @@ void x11_start_xephyr(int argc, char **argv) {
563 557
564 // running without privileges - see drop_privs call above 558 // running without privileges - see drop_privs call above
565 assert(getenv("LD_PRELOAD") == NULL); 559 assert(getenv("LD_PRELOAD") == NULL);
566#ifdef HAVE_SECCOMP
567 seccomp_install_filters();
568#endif
569 execvp(server_argv[0], server_argv); 560 execvp(server_argv[0], server_argv);
570 perror("execvp"); 561 perror("execvp");
571 _exit(1); 562 _exit(1);
@@ -610,9 +601,6 @@ void x11_start_xephyr(int argc, char **argv) {
610 601
611 // running without privileges - see drop_privs call above 602 // running without privileges - see drop_privs call above
612 assert(getenv("LD_PRELOAD") == NULL); 603 assert(getenv("LD_PRELOAD") == NULL);
613#ifdef HAVE_SECCOMP
614 seccomp_install_filters();
615#endif
616 execvp(jail_argv[0], jail_argv); 604 execvp(jail_argv[0], jail_argv);
617 perror("execvp"); 605 perror("execvp");
618 _exit(1); 606 _exit(1);
@@ -742,9 +730,6 @@ void x11_start_xpra_old(int argc, char **argv, int display, char *display_str) {
742 730
743 // running without privileges - see drop_privs call above 731 // running without privileges - see drop_privs call above
744 assert(getenv("LD_PRELOAD") == NULL); 732 assert(getenv("LD_PRELOAD") == NULL);
745#ifdef HAVE_SECCOMP
746 seccomp_install_filters();
747#endif
748 execvp(server_argv[0], server_argv); 733 execvp(server_argv[0], server_argv);
749 perror("execvp"); 734 perror("execvp");
750 _exit(1); 735 _exit(1);
@@ -796,9 +781,6 @@ void x11_start_xpra_old(int argc, char **argv, int display, char *display_str) {
796 781
797 // running without privileges - see drop_privs call above 782 // running without privileges - see drop_privs call above
798 assert(getenv("LD_PRELOAD") == NULL); 783 assert(getenv("LD_PRELOAD") == NULL);
799#ifdef HAVE_SECCOMP
800 seccomp_install_filters();
801#endif
802 execvp(attach_argv[0], attach_argv); 784 execvp(attach_argv[0], attach_argv);
803 perror("execvp"); 785 perror("execvp");
804 _exit(1); 786 _exit(1);
@@ -828,9 +810,6 @@ void x11_start_xpra_old(int argc, char **argv, int display, char *display_str) {
828 if (jail == 0) { 810 if (jail == 0) {
829 // running without privileges - see drop_privs call above 811 // running without privileges - see drop_privs call above
830 assert(getenv("LD_PRELOAD") == NULL); 812 assert(getenv("LD_PRELOAD") == NULL);
831#ifdef HAVE_SECCOMP
832 seccomp_install_filters();
833#endif
834 if (firejail_argv[0]) // shut up llvm scan-build 813 if (firejail_argv[0]) // shut up llvm scan-build
835 execvp(firejail_argv[0], firejail_argv); 814 execvp(firejail_argv[0], firejail_argv);
836 perror("execvp"); 815 perror("execvp");
@@ -859,9 +838,6 @@ void x11_start_xpra_old(int argc, char **argv, int display, char *display_str) {
859 } 838 }
860 // running without privileges - see drop_privs call above 839 // running without privileges - see drop_privs call above
861 assert(getenv("LD_PRELOAD") == NULL); 840 assert(getenv("LD_PRELOAD") == NULL);
862#ifdef HAVE_SECCOMP
863 seccomp_install_filters();
864#endif
865 execvp(stop_argv[0], stop_argv); 841 execvp(stop_argv[0], stop_argv);
866 perror("execvp"); 842 perror("execvp");
867 _exit(1); 843 _exit(1);
@@ -1028,9 +1004,6 @@ void x11_start_xpra_new(int argc, char **argv, char *display_str) {
1028 1004
1029 // running without privileges - see drop_privs call above 1005 // running without privileges - see drop_privs call above
1030 assert(getenv("LD_PRELOAD") == NULL); 1006 assert(getenv("LD_PRELOAD") == NULL);
1031#ifdef HAVE_SECCOMP
1032 seccomp_install_filters();
1033#endif
1034 execvp(server_argv[0], server_argv); 1007 execvp(server_argv[0], server_argv);
1035 perror("execvp"); 1008 perror("execvp");
1036 _exit(1); 1009 _exit(1);
@@ -1168,9 +1141,6 @@ void x11_xorg(void) {
1168#ifdef HAVE_GCOV 1141#ifdef HAVE_GCOV
1169 __gcov_flush(); 1142 __gcov_flush();
1170#endif 1143#endif
1171#ifdef HAVE_SECCOMP
1172 seccomp_install_filters();
1173#endif
1174 execlp("/usr/bin/xauth", "/usr/bin/xauth", "-v", "-f", tmpfname, 1144 execlp("/usr/bin/xauth", "/usr/bin/xauth", "-v", "-f", tmpfname,
1175 "generate", display, "MIT-MAGIC-COOKIE-1", "untrusted", NULL); 1145 "generate", display, "MIT-MAGIC-COOKIE-1", "untrusted", NULL);
1176 1146