diff options
| author |  smitsohu <smitsohu@gmail.com> | 2020-12-21 02:46:04 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-12-21 02:46:04 +0100 |
| commit | 4a798f17e1ed180a8f0319f8c0928194ee239c65 (patch) | |
| tree | 89f06a124b875965cf95674d8128efaa7cba951b | |
| parent | increase verbosity if masking ~/.config/pulse fails (diff) | |
| parent | x11=none: don't fail on abstract socket if netns … (diff) | |
| download | firejail-4a798f17e1ed180a8f0319f8c0928194ee239c65.tar.gz firejail-4a798f17e1ed180a8f0319f8c0928194ee239c65.tar.zst firejail-4a798f17e1ed180a8f0319f8c0928194ee239c65.zip | |
Merge pull request #3839 from rusty-snake/fix-3838
x11=none: don't fail on abstract socket if netns …
| -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" |