diff options
author | netblue30 <netblue30@yahoo.com> | 2016-10-02 10:24:14 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-10-02 10:24:14 -0400 |
commit | f9b1722032e79791590e03d271216482105c0e33 (patch) | |
tree | 3f25918c99984708930f2cb779349247cebede79 | |
parent | renamed --x11=block to --x11=none, brought back the requirement for network n... (diff) | |
download | firejail-f9b1722032e79791590e03d271216482105c0e33.tar.gz firejail-f9b1722032e79791590e03d271216482105c0e33.tar.zst firejail-f9b1722032e79791590e03d271216482105c0e33.zip |
renamed --x11=block to --x11=none, brought back the requirement for network namespaces for x11 sandboxing
-rw-r--r-- | src/firejail/profile.c | 2 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index faf6c49b6..59ef42a74 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -656,7 +656,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
656 | return 0; | 656 | return 0; |
657 | } | 657 | } |
658 | 658 | ||
659 | if (strcmp(ptr, "x11 block") == 0) { | 659 | if (strcmp(ptr, "x11 none") == 0) { |
660 | #ifdef HAVE_X11 | 660 | #ifdef HAVE_X11 |
661 | arg_x11_block = 1; | 661 | arg_x11_block = 1; |
662 | #endif | 662 | #endif |
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt index 9583ad426..f4b2c22fa 100644 --- a/src/man/firejail-profile.txt +++ b/src/man/firejail-profile.txt | |||
@@ -285,7 +285,7 @@ Enable X11 sandboxing with xpra. | |||
285 | \fBx11 xephyr | 285 | \fBx11 xephyr |
286 | Enable X11 sandboxing with xephyr. | 286 | Enable X11 sandboxing with xephyr. |
287 | .TP | 287 | .TP |
288 | \fBx11 block | 288 | \fBx11 none |
289 | Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} environment variable. | 289 | Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} environment variable. |
290 | Remove DISPLAY and XAUTHORITY environment variables. | 290 | Remove DISPLAY and XAUTHORITY environment variables. |
291 | Stop with error message if X11 abstract socket will be accessible in jail. | 291 | Stop with error message if X11 abstract socket will be accessible in jail. |