aboutsummaryrefslogtreecommitdiffstats
path: root/src/firejail/profile.c
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2019-10-08 15:38:47 +0200
committerLibravatar smitsohu <smitsohu@gmail.com>2019-10-08 15:38:47 +0200
commit8e62cb50dd7e4477e57c3daafa418c8b8034803b (patch)
treed88b28260396e738e41610b655ecabcc53648c01 /src/firejail/profile.c
parentlittle tweaks (diff)
downloadfirejail-8e62cb50dd7e4477e57c3daafa418c8b8034803b.tar.gz
firejail-8e62cb50dd7e4477e57c3daafa418c8b8034803b.tar.zst
firejail-8e62cb50dd7e4477e57c3daafa418c8b8034803b.zip
add HAS_X11 conditional, disconnect session manager - #2205
Diffstat (limited to 'src/firejail/profile.c')
-rw-r--r--src/firejail/profile.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 7303d30f8..40f3c3be7 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -147,6 +147,10 @@ static int check_nodbus(void) {
147 return arg_nodbus != 0; 147 return arg_nodbus != 0;
148} 148}
149 149
150static int check_x11(void) {
151 return (arg_x11_block || getenv("FIREJAIL_X11"));
152}
153
150static int check_disable_u2f(void) { 154static int check_disable_u2f(void) {
151 return checkcfg(CFG_BROWSER_DISABLE_U2F) != 0; 155 return checkcfg(CFG_BROWSER_DISABLE_U2F) != 0;
152} 156}
@@ -158,6 +162,7 @@ static int check_allow_drm(void) {
158Cond conditionals[] = { 162Cond conditionals[] = {
159 {"HAS_APPIMAGE", check_appimage}, 163 {"HAS_APPIMAGE", check_appimage},
160 {"HAS_NODBUS", check_nodbus}, 164 {"HAS_NODBUS", check_nodbus},
165 {"HAS_X11", check_x11},
161 {"BROWSER_DISABLE_U2F", check_disable_u2f}, 166 {"BROWSER_DISABLE_U2F", check_disable_u2f},
162 {"BROWSER_ALLOW_DRM", check_allow_drm}, 167 {"BROWSER_ALLOW_DRM", check_allow_drm},
163 { NULL, NULL } 168 { NULL, NULL }