aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar startx2017 <vradu.startx@yandex.com>2019-05-29 09:37:19 -0400
committerLibravatar startx2017 <vradu.startx@yandex.com>2019-05-29 09:37:19 -0400
commit049bf71f50b0f2518e141e1f194c4e30f2b983f9 (patch)
tree978ab33e3de510919e31608cd062eb1d42d3146c /src
parentmerge: checking for invalid chars in profile filename before any other proceā€¦ (diff)
downloadfirejail-049bf71f50b0f2518e141e1f194c4e30f2b983f9.tar.gz
firejail-049bf71f50b0f2518e141e1f194c4e30f2b983f9.tar.zst
firejail-049bf71f50b0f2518e141e1f194c4e30f2b983f9.zip
merge: fix --list reporting for sandboxes using --x11=none
Diffstat (limited to 'src')
-rw-r--r--src/lib/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/common.c b/src/lib/common.c
index 98fb82c11..25577f908 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -254,7 +254,7 @@ int pid_proc_cmdline_x11_xpra_xephyr(const pid_t pid) {
254 if (strncmp(arg, "--", 2) != 0) 254 if (strncmp(arg, "--", 2) != 0)
255 break; 255 break;
256 256
257 if (strcmp(arg, "--x11=xorg") == 0) 257 if (strcmp(arg, "--x11=xorg") == 0 || strcmp(arg, "--x11=none") == 0)
258 return 0; 258 return 0;
259 259
260 // check x11 xpra or xephyr 260 // check x11 xpra or xephyr