From 00acc715548b6b2338693f0b3dbf6cc9355832d9 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Wed, 1 Mar 2017 09:08:59 -0500
Subject: merge #1100 from zackw: removed mask_x11_abstract_socket

---
 src/firejail/firejail.h | 1 -
 src/firejail/fs.c       | 2 --
 src/firejail/main.c     | 4 ----
 src/firejail/profile.c  | 3 ---
 src/firejail/x11.c      | 4 ----
 5 files changed, 14 deletions(-)

(limited to 'src')

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index fbf83abb3..cafaf8c4f 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -644,7 +644,6 @@ void fs_mkdir(const char *name);
 void fs_mkfile(const char *name);
 
 // x11.c
-extern int mask_x11_abstract_socket;
 void fs_x11(void);
 int x11_display(void);
 void x11_start(int argc, char **argv);
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index c386f70cf..a06f3a35d 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -1084,7 +1084,6 @@ void fs_check_chroot_dir(const char *rootdir) {
 
 	// check x11 socket directory
 	if (getenv("FIREJAIL_X11")) {
-		mask_x11_abstract_socket = 1;
 		char *name;
 		if (asprintf(&name, "%s/tmp/.X11-unix", rootdir) == -1)
 			errExit("asprintf");
@@ -1117,7 +1116,6 @@ void fs_chroot(const char *rootdir) {
 		
 		// x11
 		if (getenv("FIREJAIL_X11")) {
-			mask_x11_abstract_socket = 1;
 			char *newx11;
 			if (asprintf(&newx11, "%s/tmp/.X11-unix", rootdir) == -1)
 				errExit("asprintf");
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 310795abf..978ca8cd2 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -2182,10 +2182,6 @@ int main(int argc, char **argv) {
 			fprintf(stderr, "Warning: --trace and --tracelog are mutually exclusive; --tracelog disabled\n");
 	}
 	
-	// disable x11 abstract socket
-	if (getenv("FIREJAIL_X11"))
-		mask_x11_abstract_socket = 1;
-	
 	// check user namespace (--noroot) options
 	if (arg_noroot) {
 		if (arg_overlay) {
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 5684a2d95..271176fcd 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -696,7 +696,6 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 		if (checkcfg(CFG_X11)) {
 			char *x11env = getenv("FIREJAIL_X11");
 			if (x11env && strcmp(x11env, "yes") == 0) {
-				mask_x11_abstract_socket = 1;
 				return 0;
 			}
 			else {
@@ -725,7 +724,6 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 		if (checkcfg(CFG_X11)) {
 			char *x11env = getenv("FIREJAIL_X11");
 			if (x11env && strcmp(x11env, "yes") == 0) {
-				mask_x11_abstract_socket = 1;
 				return 0;
 			}
 			else {
@@ -745,7 +743,6 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 		if (checkcfg(CFG_X11)) {
 			char *x11env = getenv("FIREJAIL_X11");
 			if (x11env && strcmp(x11env, "yes") == 0) {
-				mask_x11_abstract_socket = 1;
 				return 0;
 			}
 			else {
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 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <limits.h>
-int mask_x11_abstract_socket = 0;
-
 
 // Parse the DISPLAY environment variable and return a display number.
 // Returns -1 if DISPLAY is not set, or is set to anything other than :ddd.
@@ -833,8 +831,6 @@ void fs_x11(void) {
 
 void x11_block(void) {
 #ifdef HAVE_X11
-	mask_x11_abstract_socket = 1;
-
 	// check abstract socket presence and network namespace options
 	if ((!arg_nonetwork && !cfg.bridge0.configured && !cfg.interface0.configured)
 		&& x11_abstract_sockets_present()) {
-- 
cgit v1.2.3-70-g09d2