aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-10-02 10:09:09 -0400
committerLibravatar GitHub <noreply@github.com>2016-10-02 10:09:09 -0400
commit2b9b7243dff1d32730a7ca9b03c44f706fdb633d (patch)
treebabefaa142925cbe863640e36fd918fc16f12267
parentMerge pull request #828 from vismir2/master (diff)
parentFix typos found by lintian (diff)
downloadfirejail-2b9b7243dff1d32730a7ca9b03c44f706fdb633d.tar.gz
firejail-2b9b7243dff1d32730a7ca9b03c44f706fdb633d.tar.zst
firejail-2b9b7243dff1d32730a7ca9b03c44f706fdb633d.zip
Merge pull request #829 from reinerh/master
Fix typos found by lintian
-rw-r--r--README.md4
-rw-r--r--src/firejail/x11.c2
-rw-r--r--src/man/firejail-profile.txt4
-rw-r--r--src/man/firejail.txt4
4 files changed, 7 insertions, 7 deletions
diff --git a/README.md b/README.md
index 99b78d8ca..b6f80a52f 100644
--- a/README.md
+++ b/README.md
@@ -49,8 +49,8 @@ If you keep your Firejail profiles in a public repository, please give us a link
49````` 49`````
50 --x11=block 50 --x11=block
51 Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file 51 Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file
52 specified in ${XAUTHORITY} enviroment variable. Remove DISPLAY and 52 specified in ${XAUTHORITY} environment variable. Remove DISPLAY and
53 XAUTHORITY enviroment variables. Stop with error message if X11 53 XAUTHORITY environment variables. Stop with error message if X11
54 abstract socket will be accessible in jail. 54 abstract socket will be accessible in jail.
55 55
56 --put=name|pid src-filename dest-filename 56 --put=name|pid src-filename dest-filename
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 2fa7f84d8..36023e067 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -627,7 +627,7 @@ void x11_block(void) {
627 profile_add(line); 627 profile_add(line);
628 } 628 }
629 629
630 // clear enviroment 630 // clear environment
631 env_store("DISPLAY", RMENV); 631 env_store("DISPLAY", RMENV);
632 env_store("XAUTHORITY", RMENV); 632 env_store("XAUTHORITY", RMENV);
633#endif 633#endif
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 4c5651925..9583ad426 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -286,8 +286,8 @@ Enable X11 sandboxing with xpra.
286Enable X11 sandboxing with xephyr. 286Enable X11 sandboxing with xephyr.
287.TP 287.TP
288\fBx11 block 288\fBx11 block
289Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} enviroment variable. 289Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} environment variable.
290Remove DISPLAY and XAUTHORITY enviroment variables. 290Remove DISPLAY and XAUTHORITY environment variables.
291Stop with error message if X11 abstract socket will be accessible in jail. 291Stop with error message if X11 abstract socket will be accessible in jail.
292 292
293.SH Resource limits, CPU affinity, Control Groups 293.SH Resource limits, CPU affinity, Control Groups
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 2c4944331..3ceb21e78 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1714,8 +1714,8 @@ $ firejail \-\-x11=xephyr --net=eth0 openbox
1714 1714
1715.TP 1715.TP
1716\fB\-\-x11=block 1716\fB\-\-x11=block
1717Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} enviroment variable. 1717Blacklist /tmp/.X11-unix directory, ${HOME}/.Xauthority and file specified in ${XAUTHORITY} environment variable.
1718Remove DISPLAY and XAUTHORITY enviroment variables. 1718Remove DISPLAY and XAUTHORITY environment variables.
1719Stop with error message if X11 abstract socket will be accessible in jail. 1719Stop with error message if X11 abstract socket will be accessible in jail.
1720.br 1720.br
1721 1721