diff options
| author |  rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-12-19 10:54:32 +0100 |
|---|---|---|
| committer | rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-12-19 10:54:32 +0100 |
| commit | bdf44029665d564dd31098e03aeb828d2932468c (patch) | |
| tree | 94f4aefded7523148c4a9c983d89820449c45370 /src/firejail | |
| parent | Refactor electron.profile and electron based programs (#3807) (diff) | |
| download | firejail-bdf44029665d564dd31098e03aeb828d2932468c.tar.gz firejail-bdf44029665d564dd31098e03aeb828d2932468c.tar.zst firejail-bdf44029665d564dd31098e03aeb828d2932468c.zip | |
x11=none: don't fail on abstract socket if netns …
…is used.
fix #3838 -- --x11=none --netns=isolated invalidly errors on the abstract X11 socket being accessible
Diffstat (limited to 'src/firejail')
| -rw-r--r-- | src/firejail/x11.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index e10abad4e..4872a5207 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
| @@ -1368,7 +1368,7 @@ void fs_x11(void) { | |||
| 1368 | void x11_block(void) { | 1368 | void x11_block(void) { |
| 1369 | #ifdef HAVE_X11 | 1369 | #ifdef HAVE_X11 |
| 1370 | // check abstract socket presence and network namespace options | 1370 | // check abstract socket presence and network namespace options |
| 1371 | if ((!arg_nonetwork && !cfg.bridge0.configured && !cfg.interface0.configured) | 1371 | if ((!arg_nonetwork && !arg_netns && !cfg.bridge0.configured && !cfg.interface0.configured) |
| 1372 | && x11_abstract_sockets_present()) { | 1372 | && x11_abstract_sockets_present()) { |
| 1373 | fprintf(stderr, "ERROR: --x11=none specified, but abstract X11 socket still accessible.\n" | 1373 | fprintf(stderr, "ERROR: --x11=none specified, but abstract X11 socket still accessible.\n" |
| 1374 | "Additional setup required. To block abstract X11 socket you can either:\n" | 1374 | "Additional setup required. To block abstract X11 socket you can either:\n" |