From ed17011e5010164254433ea4486b05f5b12f18d3 Mon Sep 17 00:00:00 2001
From: smitsohu <smitsohu@gmail.com>
Date: Wed, 11 Dec 2019 16:44:34 +0100
Subject: little things

---
 src/firejail/util.c | 6 +++---
 src/firejail/x11.c  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/firejail/util.c b/src/firejail/util.c
index 4634993df..dd70d68a9 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -1111,10 +1111,10 @@ unsigned extract_timeout(const char *str) {
 }
 
 void disable_file_or_dir(const char *fname) {
-	if (arg_debug)
-		printf("blacklist %s\n", fname);
 	struct stat s;
 	if (stat(fname, &s) != -1) {
+		if (arg_debug)
+			printf("blacklist %s\n", fname);
 		if (is_dir(fname)) {
 			if (mount(RUN_RO_DIR, fname, "none", MS_BIND, "mode=400,gid=0") < 0)
 				errExit("disable directory");
@@ -1123,8 +1123,8 @@ void disable_file_or_dir(const char *fname) {
 			if (mount(RUN_RO_FILE, fname, "none", MS_BIND, "mode=400,gid=0") < 0)
 				errExit("disable file");
 		}
+		fs_logger2("blacklist", fname);
 	}
-	fs_logger2("blacklist", fname);
 }
 
 void disable_file_path(const char *path, const char *file) {
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 944c24bc7..b390ad38e 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1248,10 +1248,10 @@ void x11_xorg(void) {
 				disable_file_or_dir(rp);
 			free(rp);
 		}
-		// update environment variable, so our new .Xauthority file is used
-		if (setenv("XAUTHORITY", dest, 1) < 0)
-			errExit("setenv");
 	}
+	// set environment variable
+	if (setenv("XAUTHORITY", dest, 1) < 0)
+		errExit("setenv");
 	free(dest);
 #endif
 }
-- 
cgit v1.2.3-54-g00ecf