aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/x11.c
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-03-01 09:08:59 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2017-03-01 09:08:59 -0500
commit00acc715548b6b2338693f0b3dbf6cc9355832d9 (patch)
tree99351ede72b843fa0ac5fdefe5f6c6f60decd9ef /src/firejail/x11.c
parentprofile merges (diff)
downloadfirejail-00acc715548b6b2338693f0b3dbf6cc9355832d9.tar.gz
firejail-00acc715548b6b2338693f0b3dbf6cc9355832d9.tar.zst
firejail-00acc715548b6b2338693f0b3dbf6cc9355832d9.zip
merge #1100 from zackw: removed mask_x11_abstract_socket
Diffstat (limited to 'src/firejail/x11.c')
-rw-r--r--src/firejail/x11.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 5bbc327a6..b668c1c9c 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -31,8 +31,6 @@
31#include <sys/wait.h> 31#include <sys/wait.h>
32#include <errno.h> 32#include <errno.h>
33#include <limits.h> 33#include <limits.h>
34int mask_x11_abstract_socket = 0;
35
36 34
37// Parse the DISPLAY environment variable and return a display number. 35// Parse the DISPLAY environment variable and return a display number.
38// Returns -1 if DISPLAY is not set, or is set to anything other than :ddd. 36// Returns -1 if DISPLAY is not set, or is set to anything other than :ddd.
@@ -833,8 +831,6 @@ void fs_x11(void) {
833 831
834void x11_block(void) { 832void x11_block(void) {
835#ifdef HAVE_X11 833#ifdef HAVE_X11
836 mask_x11_abstract_socket = 1;
837
838 // check abstract socket presence and network namespace options 834 // check abstract socket presence and network namespace options
839 if ((!arg_nonetwork && !cfg.bridge0.configured && !cfg.interface0.configured) 835 if ((!arg_nonetwork && !cfg.bridge0.configured && !cfg.interface0.configured)
840 && x11_abstract_sockets_present()) { 836 && x11_abstract_sockets_present()) {