aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-03-29 08:49:44 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-03-29 08:49:44 -0400
commitdcc8914fd1bcae2fc13dc22cc08b37d8b12d5dda (patch)
treea430a7a6517be7f6f35b5477644fc9c2e6e31339
parentMerge branch 'master' of https://github.com/netblue30/firejail (diff)
downloadfirejail-dcc8914fd1bcae2fc13dc22cc08b37d8b12d5dda.tar.gz
firejail-dcc8914fd1bcae2fc13dc22cc08b37d8b12d5dda.tar.zst
firejail-dcc8914fd1bcae2fc13dc22cc08b37d8b12d5dda.zip
x11 fixes
-rw-r--r--etc/disable-common.inc2
-rw-r--r--src/firejail/x11.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index 06ced4e53..b1133f28f 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -1,10 +1,10 @@
1# History files in $HOME 1# History files in $HOME
2blacklist-nolog ${HOME}/.history 2blacklist-nolog ${HOME}/.history
3blacklist-nolog ${HOME}/.*_history 3blacklist-nolog ${HOME}/.*_history
4
5blacklist ${HOME}/.local/share/systemd 4blacklist ${HOME}/.local/share/systemd
6blacklist-nolog ${HOME}/.adobe 5blacklist-nolog ${HOME}/.adobe
7blacklist-nolog ${HOME}/.macromedia 6blacklist-nolog ${HOME}/.macromedia
7read-only ${HOME}/.local/share/applications
8 8
9# X11 session autostart 9# X11 session autostart
10blacklist ${HOME}/.xinitrc 10blacklist ${HOME}/.xinitrc
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 851157420..ae37cdd57 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -275,7 +275,7 @@ void x11_start_xephyr(int argc, char **argv) {
275 sleep(1); 275 sleep(1);
276 276
277 if (!arg_quiet) 277 if (!arg_quiet)
278 printf("Xphyr server pid %d, client pid %d\n", server, client); 278 printf("Xephyr server pid %d, client pid %d\n", server, client);
279 279
280 exit(0); 280 exit(0);
281} 281}