aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--README3
-rw-r--r--README.md3
-rw-r--r--RELNOTES4
-rw-r--r--etc/Fritzing.profile35
-rw-r--r--etc/Viber.profile4
-rw-r--r--etc/disable-programs.inc5
-rw-r--r--etc/discord-canary.profile23
-rw-r--r--etc/evince.profile2
-rw-r--r--etc/firefox-developer-edition.profile10
-rw-r--r--etc/firefox.profile2
-rw-r--r--etc/ideaIC.profile10
-rw-r--r--etc/kwin_x11.profile3
-rw-r--r--etc/lollypop.profile2
-rw-r--r--etc/minetest.profile2
-rw-r--r--etc/okular.profile5
-rw-r--r--etc/onionshare-gui.profile35
-rw-r--r--etc/pitivi.profile33
-rw-r--r--etc/pycharm-community.profile32
-rw-r--r--etc/pycharm-professional.profile7
-rw-r--r--etc/quiterss.profile2
-rw-r--r--etc/slack.profile2
-rw-r--r--etc/steam.profile2
-rw-r--r--etc/surf.profile2
-rw-r--r--etc/terasology.profile2
-rw-r--r--etc/torbrowser-launcher.profile2
-rw-r--r--etc/transmission-qt.profile3
-rw-r--r--etc/w3m.profile2
-rw-r--r--etc/xonotic.profile2
-rw-r--r--src/faudit/caps.c2
-rw-r--r--src/faudit/dbus.c2
-rw-r--r--src/faudit/dev.c2
-rw-r--r--src/faudit/faudit.h2
-rw-r--r--src/faudit/files.c2
-rw-r--r--src/faudit/main.c2
-rw-r--r--src/faudit/network.c2
-rw-r--r--src/faudit/pid.c2
-rw-r--r--src/faudit/seccomp.c2
-rw-r--r--src/faudit/syscall.c2
-rw-r--r--src/faudit/x11.c2
-rw-r--r--src/fbuilder/build_bin.c2
-rw-r--r--src/fbuilder/build_fs.c2
-rw-r--r--src/fbuilder/build_home.c2
-rw-r--r--src/fbuilder/build_profile.c2
-rw-r--r--src/fbuilder/build_seccomp.c2
-rw-r--r--src/fbuilder/fbuilder.h2
-rw-r--r--src/fbuilder/filedb.c2
-rw-r--r--src/fbuilder/main.c2
-rw-r--r--src/fbuilder/utils.c2
-rw-r--r--src/fcopy/main.c2
-rw-r--r--src/firecfg/desktop_files.c2
-rw-r--r--src/firecfg/firecfg.config29
-rw-r--r--src/firecfg/firecfg.h2
-rw-r--r--src/firecfg/main.c2
-rw-r--r--src/firecfg/sound.c2
-rw-r--r--src/firecfg/util.c2
-rw-r--r--src/firejail/appimage.c2
-rw-r--r--src/firejail/appimage_size.c2
-rw-r--r--src/firejail/arp.c2
-rw-r--r--src/firejail/bandwidth.c2
-rw-r--r--src/firejail/caps.c2
-rw-r--r--src/firejail/cgroup.c2
-rw-r--r--src/firejail/checkcfg.c2
-rw-r--r--src/firejail/cmdline.c2
-rw-r--r--src/firejail/cpu.c2
-rw-r--r--src/firejail/env.c8
-rw-r--r--src/firejail/firejail.h10
-rw-r--r--src/firejail/fs.c2
-rw-r--r--src/firejail/fs_bin.c2
-rw-r--r--src/firejail/fs_dev.c4
-rw-r--r--src/firejail/fs_etc.c2
-rw-r--r--src/firejail/fs_home.c2
-rw-r--r--src/firejail/fs_hostname.c12
-rw-r--r--src/firejail/fs_lib.c24
-rw-r--r--src/firejail/fs_lib2.c2
-rw-r--r--src/firejail/fs_logger.c2
-rw-r--r--src/firejail/fs_mkdir.c2
-rw-r--r--src/firejail/fs_trace.c2
-rw-r--r--src/firejail/fs_var.c2
-rw-r--r--src/firejail/fs_whitelist.c2
-rw-r--r--src/firejail/git.c2
-rw-r--r--src/firejail/join.c2
-rw-r--r--src/firejail/ls.c2
-rw-r--r--src/firejail/main.c38
-rw-r--r--src/firejail/netfilter.c2
-rw-r--r--src/firejail/netns.c2
-rw-r--r--src/firejail/network.c36
-rw-r--r--src/firejail/network_main.c2
-rw-r--r--src/firejail/no_sandbox.c2
-rw-r--r--src/firejail/output.c2
-rw-r--r--src/firejail/paths.c2
-rw-r--r--src/firejail/preproc.c2
-rw-r--r--src/firejail/profile.c39
-rw-r--r--src/firejail/protocol.c2
-rw-r--r--src/firejail/pulseaudio.c2
-rw-r--r--src/firejail/restrict_users.c2
-rw-r--r--src/firejail/restricted_shell.c2
-rw-r--r--src/firejail/rlimit.c2
-rw-r--r--src/firejail/run_symlink.c2
-rw-r--r--src/firejail/sandbox.c16
-rw-r--r--src/firejail/sbox.c2
-rw-r--r--src/firejail/seccomp.c2
-rw-r--r--src/firejail/shutdown.c2
-rw-r--r--src/firejail/usage.c2
-rw-r--r--src/firejail/util.c2
-rw-r--r--src/firejail/x11.c2
-rw-r--r--src/firemon/arp.c2
-rw-r--r--src/firemon/caps.c2
-rw-r--r--src/firemon/cgroup.c2
-rw-r--r--src/firemon/cpu.c2
-rw-r--r--src/firemon/firemon.c2
-rw-r--r--src/firemon/firemon.h2
-rw-r--r--src/firemon/interface.c2
-rw-r--r--src/firemon/list.c2
-rw-r--r--src/firemon/netstats.c2
-rw-r--r--src/firemon/procevent.c2
-rw-r--r--src/firemon/route.c2
-rw-r--r--src/firemon/seccomp.c2
-rw-r--r--src/firemon/top.c2
-rw-r--r--src/firemon/tree.c2
-rw-r--r--src/firemon/usage.c2
-rw-r--r--src/firemon/x11.c2
-rw-r--r--src/fldd/main.c2
-rw-r--r--src/floader/loader.c2
-rw-r--r--src/fnet/arp.c2
-rw-r--r--src/fnet/fnet.h2
-rw-r--r--src/fnet/interface.c2
-rw-r--r--src/fnet/main.c2
-rw-r--r--src/fnet/veth.c2
-rw-r--r--src/fnetfilter/main.c2
-rw-r--r--src/fsec-optimize/fsec_optimize.h2
-rw-r--r--src/fsec-optimize/main.c4
-rw-r--r--src/fsec-optimize/optimizer.c4
-rw-r--r--src/fsec-print/fsec_print.h2
-rw-r--r--src/fsec-print/main.c2
-rw-r--r--src/fsec-print/print.c3
-rw-r--r--src/fsec-print/syscall_list.c2
-rw-r--r--src/fseccomp/errno.c2
-rw-r--r--src/fseccomp/fseccomp.h2
-rw-r--r--src/fseccomp/main.c2
-rw-r--r--src/fseccomp/protocol.c2
-rw-r--r--src/fseccomp/seccomp.c2
-rw-r--r--src/fseccomp/seccomp_file.c2
-rw-r--r--src/fseccomp/seccomp_secondary.c2
-rw-r--r--src/fseccomp/syscall.c2
-rw-r--r--src/ftee/ftee.h2
-rw-r--r--src/ftee/main.c2
-rw-r--r--src/include/common.h2
-rw-r--r--src/include/euid_common.h2
-rw-r--r--src/include/pid.h2
-rw-r--r--src/include/seccomp.h2
-rw-r--r--src/include/syscall.h67
-rw-r--r--src/lib/common.c2
-rw-r--r--src/lib/pid.c2
-rw-r--r--src/libpostexecseccomp/libpostexecseccomp.c2
-rw-r--r--src/libpostexecseccomp/libpostexecseccomp.h2
-rw-r--r--src/libtrace/libtrace.c2
-rw-r--r--src/libtracelog/libtracelog.c2
-rw-r--r--src/tools/extract_caps.c2
-rw-r--r--src/tools/extract_syscalls.c2
-rw-r--r--src/tools/rvtest.c2
-rwxr-xr-xtest/appimage/appimage-args.exp2
-rwxr-xr-xtest/appimage/appimage-v1.exp2
-rwxr-xr-xtest/appimage/appimage-v2.exp2
-rwxr-xr-xtest/appimage/appimage.sh2
-rwxr-xr-xtest/appimage/filename.exp2
-rwxr-xr-xtest/apps-x11-xorg/apps-x11-xorg.sh2
-rwxr-xr-xtest/apps-x11-xorg/firefox.exp2
-rwxr-xr-xtest/apps-x11-xorg/thunderbird.exp2
-rwxr-xr-xtest/apps-x11-xorg/transmission-gtk.exp2
-rwxr-xr-xtest/apps-x11/apps-x11.sh2
-rwxr-xr-xtest/apps-x11/chromium.exp2
-rwxr-xr-xtest/apps-x11/firefox.exp2
-rwxr-xr-xtest/apps-x11/thunderbird.exp2
-rwxr-xr-xtest/apps-x11/transmission-gtk.exp2
-rwxr-xr-xtest/apps-x11/x11-none.exp2
-rwxr-xr-xtest/apps-x11/x11-xephyr.exp2
-rwxr-xr-xtest/apps-x11/xterm-xephyr.exp2
-rwxr-xr-xtest/apps-x11/xterm-xorg.exp2
-rwxr-xr-xtest/apps-x11/xterm-xpra.exp2
-rwxr-xr-xtest/apps/apps.sh2
-rwxr-xr-xtest/apps/chromium.exp2
-rwxr-xr-xtest/apps/deluge.exp2
-rwxr-xr-xtest/apps/fbreader.exp2
-rwxr-xr-xtest/apps/filezilla.exp2
-rwxr-xr-xtest/apps/firefox.exp2
-rwxr-xr-xtest/apps/gnome-mplayer.exp2
-rwxr-xr-xtest/apps/gthumb.exp2
-rwxr-xr-xtest/apps/hexchat.exp2
-rwxr-xr-xtest/apps/kcalc.exp2
-rwxr-xr-xtest/apps/ktorrent.exp2
-rwxr-xr-xtest/apps/midori.exp2
-rwxr-xr-xtest/apps/opera.exp2
-rwxr-xr-xtest/apps/qbittorrent.exp2
-rwxr-xr-xtest/apps/thunderbird.exp2
-rwxr-xr-xtest/apps/transmission-qt.exp2
-rwxr-xr-xtest/apps/uget-gtk.exp2
-rwxr-xr-xtest/apps/vlc.exp2
-rwxr-xr-xtest/apps/wine.exp2
-rwxr-xr-xtest/apps/xchat.exp2
-rwxr-xr-xtest/chroot/chroot.sh2
-rwxr-xr-xtest/environment/csh.exp2
-rwxr-xr-xtest/environment/dns.exp10
-rw-r--r--test/environment/dns.profile1
-rwxr-xr-xtest/environment/env.exp2
-rwxr-xr-xtest/environment/environment.sh2
-rwxr-xr-xtest/environment/firejail-in-firejail.exp2
-rwxr-xr-xtest/environment/firejail-in-firejail2.exp2
-rwxr-xr-xtest/environment/hostfile.exp2
-rwxr-xr-xtest/environment/machineid.exp2
-rwxr-xr-xtest/environment/nice.exp2
-rwxr-xr-xtest/environment/quiet.exp2
-rwxr-xr-xtest/environment/shell-none.exp2
-rwxr-xr-xtest/environment/sound.exp2
-rwxr-xr-xtest/environment/timeout.exp2
-rwxr-xr-xtest/environment/zsh.exp2
-rwxr-xr-xtest/fcopy/cmdline.exp2
-rwxr-xr-xtest/fcopy/dircopy.exp2
-rwxr-xr-xtest/fcopy/fcopy.sh2
-rwxr-xr-xtest/fcopy/filecopy.exp2
-rwxr-xr-xtest/fcopy/linkcopy.exp2
-rwxr-xr-xtest/fcopy/trailing.exp2
-rwxr-xr-xtest/filters/caps-print.exp2
-rwxr-xr-xtest/filters/caps.exp2
-rwxr-xr-xtest/filters/debug.exp2
-rwxr-xr-xtest/filters/filters.sh2
-rwxr-xr-xtest/filters/fseccomp.exp2
-rwxr-xr-xtest/filters/memwrexe-32.exp2
-rwxr-xr-xtest/filters/memwrexe.exp2
-rwxr-xr-xtest/filters/noroot.exp2
-rwxr-xr-xtest/filters/protocol.exp2
-rwxr-xr-xtest/filters/seccomp-bad-empty.exp2
-rwxr-xr-xtest/filters/seccomp-chmod-profile.exp2
-rwxr-xr-xtest/filters/seccomp-chmod.exp2
-rwxr-xr-xtest/filters/seccomp-chown.exp2
-rwxr-xr-xtest/filters/seccomp-debug-32.exp2
-rwxr-xr-xtest/filters/seccomp-debug.exp2
-rwxr-xr-xtest/filters/seccomp-dualfilter.exp2
-rwxr-xr-xtest/filters/seccomp-empty.exp2
-rwxr-xr-xtest/filters/seccomp-errno.exp2
-rwxr-xr-xtest/filters/seccomp-ptrace.exp2
-rwxr-xr-xtest/filters/seccomp-su.exp2
-rw-r--r--test/filters/syscall_test.c2
-rwxr-xr-xtest/fnetfilter/cmdline.exp2
-rwxr-xr-xtest/fnetfilter/copy.exp2
-rwxr-xr-xtest/fnetfilter/default.exp2
-rwxr-xr-xtest/fnetfilter/fnetfilter.sh2
-rwxr-xr-xtest/fnetfilter/template.exp2
-rwxr-xr-xtest/fs/fs.sh2
-rwxr-xr-xtest/fs/fs_dev_shm.exp2
-rwxr-xr-xtest/fs/fs_var_lock.exp2
-rwxr-xr-xtest/fs/fs_var_tmp.exp2
-rwxr-xr-xtest/fs/invalid_filename.exp2
-rwxr-xr-xtest/fs/kmsg.exp2
-rwxr-xr-xtest/fs/mkdir_mkfile.exp2
-rwxr-xr-xtest/fs/option_blacklist.exp2
-rwxr-xr-xtest/fs/option_blacklist_glob.exp2
-rwxr-xr-xtest/fs/private-bin.exp2
-rwxr-xr-xtest/fs/private-etc-empty.exp2
-rwxr-xr-xtest/fs/private-etc.exp2
-rwxr-xr-xtest/fs/private-home-dir.exp2
-rwxr-xr-xtest/fs/private-home.exp2
-rwxr-xr-xtest/fs/private-homedir.exp2
-rwxr-xr-xtest/fs/private-lib.exp2
-rwxr-xr-xtest/fs/private-whitelist.exp2
-rwxr-xr-xtest/fs/private.exp2
-rwxr-xr-xtest/fs/read-write.exp2
-rwxr-xr-xtest/fs/sys_fs.exp2
-rwxr-xr-xtest/fs/whitelist-dev.exp2
-rwxr-xr-xtest/fs/whitelist-double.exp2
-rwxr-xr-xtest/fs/whitelist-downloads.exp2
-rwxr-xr-xtest/fs/whitelist-empty.exp2
-rwxr-xr-xtest/fs/whitelist.exp2
-rwxr-xr-xtest/network/4bridges_arp.exp2
-rwxr-xr-xtest/network/4bridges_ip.exp2
-rwxr-xr-xtest/network/bandwidth.exp2
-rwxr-xr-xtest/network/firemon-interfaces.exp2
-rwxr-xr-xtest/network/hostname.exp2
-rwxr-xr-xtest/network/ip6.exp2
-rwxr-xr-xtest/network/iprange.exp2
-rwxr-xr-xtest/network/net_arp.exp2
-rwxr-xr-xtest/network/net_badip.exp2
-rwxr-xr-xtest/network/net_defaultgw.exp2
-rwxr-xr-xtest/network/net_defaultgw2.exp2
-rwxr-xr-xtest/network/net_defaultgw3.exp2
-rwxr-xr-xtest/network/net_ip.exp2
-rwxr-xr-xtest/network/net_local.exp2
-rwxr-xr-xtest/network/net_mac.exp2
-rwxr-xr-xtest/network/net_macvlan2.exp2
-rwxr-xr-xtest/network/net_mtu.exp2
-rwxr-xr-xtest/network/net_netfilter.exp2
-rwxr-xr-xtest/network/net_noip.exp2
-rwxr-xr-xtest/network/net_noip2.exp2
-rwxr-xr-xtest/network/net_none.exp2
-rwxr-xr-xtest/network/net_profile.exp2
-rwxr-xr-xtest/network/net_scan.exp2
-rwxr-xr-xtest/network/net_veth.exp2
-rwxr-xr-xtest/network/netfilter-template.exp2
-rwxr-xr-xtest/network/netns.exp2
-rwxr-xr-xtest/network/netstats.exp2
-rwxr-xr-xtest/network/network.sh2
-rw-r--r--test/network/tcpserver.c2
-rwxr-xr-xtest/network/veth-name.exp2
-rwxr-xr-xtest/overlay/firefox-x11-xorg.exp2
-rwxr-xr-xtest/overlay/firefox-x11.exp2
-rwxr-xr-xtest/overlay/firefox.exp2
-rwxr-xr-xtest/overlay/overlay.sh2
-rwxr-xr-xtest/private-lib/atril.exp2
-rwxr-xr-xtest/private-lib/eog.exp2
-rwxr-xr-xtest/private-lib/eom.exp2
-rwxr-xr-xtest/private-lib/evince.exp2
-rwxr-xr-xtest/private-lib/galculator.exp2
-rwxr-xr-xtest/private-lib/gnome-calculator.exp2
-rwxr-xr-xtest/private-lib/gpicview.exp2
-rwxr-xr-xtest/private-lib/leafpad.exp2
-rwxr-xr-xtest/private-lib/mousepad.exp2
-rwxr-xr-xtest/private-lib/private-lib.sh2
-rwxr-xr-xtest/private-lib/transmission-gtk.exp2
-rwxr-xr-xtest/private-lib/xcalc.exp2
-rwxr-xr-xtest/profiles/ignore.exp2
-rwxr-xr-xtest/profiles/profile_syntax.exp2
-rwxr-xr-xtest/profiles/profile_syntax2.exp2
-rwxr-xr-xtest/profiles/profiles.sh2
-rwxr-xr-xtest/profiles/test-profile.exp2
-rwxr-xr-xtest/root/cgroup.exp2
-rwxr-xr-xtest/root/checkcfg.exp2
-rwxr-xr-xtest/root/firecfg.exp2
-rwxr-xr-xtest/root/join.exp2
-rwxr-xr-xtest/root/private.exp2
-rwxr-xr-xtest/root/seccomp-chmod.exp2
-rwxr-xr-xtest/root/seccomp-chown.exp2
-rwxr-xr-xtest/root/seccomp-umount.exp2
-rwxr-xr-xtest/root/whitelist.exp2
-rwxr-xr-xtest/stress/blacklist.exp2
-rwxr-xr-xtest/stress/env.exp2
-rwxr-xr-xtest/stress/net_macvlan.exp2
-rwxr-xr-xtest/stress/stress.sh2
-rwxr-xr-xtest/sysutils/cpio.exp2
-rwxr-xr-xtest/sysutils/file.exp2
-rwxr-xr-xtest/sysutils/gzip.exp2
-rwxr-xr-xtest/sysutils/less.exp2
-rwxr-xr-xtest/sysutils/ping.exp2
-rwxr-xr-xtest/sysutils/strings.exp2
-rwxr-xr-xtest/sysutils/sysutils.sh2
-rwxr-xr-xtest/sysutils/tar.exp2
-rwxr-xr-xtest/sysutils/xz.exp2
-rwxr-xr-xtest/sysutils/xzdec.exp2
-rwxr-xr-xtest/test.sh2
-rwxr-xr-xtest/utils/audit.exp2
-rwxr-xr-xtest/utils/caps-print.exp2
-rwxr-xr-xtest/utils/cpu-print.exp2
-rwxr-xr-xtest/utils/dns-print.exp8
-rwxr-xr-xtest/utils/firemon-caps.exp2
-rwxr-xr-xtest/utils/firemon-cgroup.exp2
-rwxr-xr-xtest/utils/firemon-cpu.exp2
-rwxr-xr-xtest/utils/firemon-interface.exp2
-rwxr-xr-xtest/utils/firemon-name.exp2
-rwxr-xr-xtest/utils/firemon-seccomp.exp2
-rwxr-xr-xtest/utils/firemon-version.exp2
-rwxr-xr-xtest/utils/fs-print.exp2
-rwxr-xr-xtest/utils/help.exp2
-rwxr-xr-xtest/utils/join.exp2
-rwxr-xr-xtest/utils/join2.exp2
-rwxr-xr-xtest/utils/join3.exp2
-rwxr-xr-xtest/utils/join4.exp2
-rwxr-xr-xtest/utils/list.exp2
-rwxr-xr-xtest/utils/man.exp2
-rwxr-xr-xtest/utils/protocol-print.exp2
-rwxr-xr-xtest/utils/seccomp-print.exp2
-rwxr-xr-xtest/utils/shutdown.exp2
-rwxr-xr-xtest/utils/shutdown2.exp2
-rwxr-xr-xtest/utils/shutdown3.exp2
-rwxr-xr-xtest/utils/shutdown4.exp2
-rwxr-xr-xtest/utils/top.exp2
-rwxr-xr-xtest/utils/trace.exp2
-rwxr-xr-xtest/utils/tree.exp2
-rwxr-xr-xtest/utils/utils.sh2
-rwxr-xr-xtest/utils/version.exp2
378 files changed, 787 insertions, 432 deletions
diff --git a/.gitignore b/.gitignore
index d87f8663d..eeaa0bb03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
2*.so 2*.so
3*~ 3*~
4*.swp 4*.swp
5*.deb
5*.rpm 6*.rpm
6*.gcda 7*.gcda
7*.gcno 8*.gcno
@@ -9,6 +10,7 @@ Makefile
9autom4te.cache/ 10autom4te.cache/
10config.log 11config.log
11config.status 12config.status
13firejail-*.tar.xz
12firejail-login.5 14firejail-login.5
13firejail-profile.5 15firejail-profile.5
14firejail-config.5 16firejail-config.5
@@ -25,6 +27,7 @@ src/fnet/fnet
25src/fnetfilter/fnetfilter 27src/fnetfilter/fnetfilter
26src/fsec-print/fsec-print 28src/fsec-print/fsec-print
27src/fseccomp/fseccomp 29src/fseccomp/fseccomp
30src/fsec-optimize/fsec-optimize
28src/fcopy/fcopy 31src/fcopy/fcopy
29src/fldd/fldd 32src/fldd/fldd
30src/fbuilder/fbuilder 33src/fbuilder/fbuilder
diff --git a/README b/README
index b0f5d2dfb..ac70b1631 100644
--- a/README
+++ b/README
@@ -594,6 +594,7 @@ Vasya Novikov (https://github.com/vn971)
594 - fixed firecfg clean/clear issue 594 - fixed firecfg clean/clear issue
595 - found the ugliest bug so far 595 - found the ugliest bug so far
596 - seccomp debug description in man page 596 - seccomp debug description in man page
597 - seccomp syscall list update for glibc 2.26-10
597Veeti Paananen (https://github.com/veeti) 598Veeti Paananen (https://github.com/veeti)
598 - fixed Spotify profile 599 - fixed Spotify profile
599vismir2 (https://github.com/vismir2) 600vismir2 (https://github.com/vismir2)
@@ -601,6 +602,8 @@ vismir2 (https://github.com/vismir2)
601 - claws-mail, mutt, git, emacs, vim profiles 602 - claws-mail, mutt, git, emacs, vim profiles
602 - lots of profile fixes 603 - lots of profile fixes
603 - support for truecrypt and zuluCrypt 604 - support for truecrypt and zuluCrypt
605viq (https://github.com/viq)
606 - discord-canary profile
604Vladimir Gorelov (https://github.com/larkvirtual) 607Vladimir Gorelov (https://github.com/larkvirtual)
605 - added Yandex browser profile 608 - added Yandex browser profile
606Vladimir Schowalter (https://github.com/VladimirSchowalter20) 609Vladimir Schowalter (https://github.com/VladimirSchowalter20)
diff --git a/README.md b/README.md
index a4cff8934..7bd691ba8 100644
--- a/README.md
+++ b/README.md
@@ -100,4 +100,5 @@ Use this issue to request new profiles: [#1139](https://github.com/netblue30/fir
100 100
101## New profiles 101## New profiles
102 102
103Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed 103Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed, discord-canary,
104pycharm-community, pycharm-professional, Pitivi, OnionShare, Fritzing
diff --git a/RELNOTES b/RELNOTES
index a4cf17f70..2bab5ddc2 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,6 +1,8 @@
1firejail (0.9.53) baseline; urgency=low 1firejail (0.9.53) baseline; urgency=low
2 * work in progress 2 * work in progress
3 * new profiles: basilisk, Tor Browser language packs, PlayOnLinux, sylpheed 3 * seccomp syscall list update for glibc 2.26-10
4 * new profiles: basilisk, Tor Browser language packs, PlayOnLinux, sylpheed, discord-canary
5 * new profiles: pycharm-community, pycharm-professional
4 -- netblue30 <netblue30@yahoo.com> Tue, 12 Dec 2017 08:00:00 -0500 6 -- netblue30 <netblue30@yahoo.com> Tue, 12 Dec 2017 08:00:00 -0500
5 7
6firejail (0.9.52) baseline; urgency=low 8firejail (0.9.52) baseline; urgency=low
diff --git a/etc/Fritzing.profile b/etc/Fritzing.profile
new file mode 100644
index 000000000..0c4ad0647
--- /dev/null
+++ b/etc/Fritzing.profile
@@ -0,0 +1,35 @@
1# Firejail profile for fritzing
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/Fritzing.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8noblacklist ${HOME}/.config/Fritzing
9
10include /etc/firejail/disable-common.inc
11include /etc/firejail/disable-devel.inc
12include /etc/firejail/disable-passwdmgr.inc
13include /etc/firejail/disable-programs.inc
14
15include /etc/firejail/whitelist-var-common.inc
16
17caps.drop all
18ipc-namespace
19netfilter
20nodvd
21nogroups
22nonewprivs
23noroot
24nosound
25notv
26novideo
27protocol unix,inet,inet6
28seccomp
29shell none
30
31private-dev
32private-tmp
33
34noexec ${HOME}
35noexec /tmp
diff --git a/etc/Viber.profile b/etc/Viber.profile
index f5843bfd4..eb244efca 100644
--- a/etc/Viber.profile
+++ b/etc/Viber.profile
@@ -31,8 +31,10 @@ shell none
31 31
32disable-mnt 32disable-mnt
33private-bin sh,bash,dig,awk,Viber 33private-bin sh,bash,dig,awk,Viber
34private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf 34private-etc hosts,fonts,mailcap,resolv.conf,X11,pulse,alternatives,localtime,nsswitch.conf,ssl,proxychains.conf,pki,ca-certificates,crypto-policies
35private-tmp 35private-tmp
36 36
37noexec ${HOME} 37noexec ${HOME}
38noexec /tmp 38noexec /tmp
39
40env QTWEBENGINE_DISABLE_SANDBOX=1
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 74e7e45a7..8cfcaa838 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -3,6 +3,7 @@
3include /etc/firejail/disable-programs.local 3include /etc/firejail/disable-programs.local
4 4
5blacklist ${HOME}/Monero/wallets 5blacklist ${HOME}/Monero/wallets
6blacklist ${HOME}/snap
6blacklist ${HOME}/.*coin 7blacklist ${HOME}/.*coin
7blacklist ${HOME}/.8pecxstudios 8blacklist ${HOME}/.8pecxstudios
8blacklist ${HOME}/.AndroidStudio* 9blacklist ${HOME}/.AndroidStudio*
@@ -13,6 +14,7 @@ blacklist ${HOME}/.IdeaIC*
13blacklist ${HOME}/.LuminanceHDR 14blacklist ${HOME}/.LuminanceHDR
14blacklist ${HOME}/.Mathematica 15blacklist ${HOME}/.Mathematica
15blacklist ${HOME}/.Natron 16blacklist ${HOME}/.Natron
17blacklist ${HOME}/.PyCharm*
16blacklist ${HOME}/.Skype 18blacklist ${HOME}/.Skype
17blacklist ${HOME}/.Steam 19blacklist ${HOME}/.Steam
18blacklist ${HOME}/.Steampath 20blacklist ${HOME}/.Steampath
@@ -41,6 +43,7 @@ blacklist ${HOME}/.config/Clementine
41blacklist ${HOME}/.config/Cryptocat 43blacklist ${HOME}/.config/Cryptocat
42blacklist ${HOME}/.config/Franz 44blacklist ${HOME}/.config/Franz
43blacklist ${HOME}/.config/FreeCAD 45blacklist ${HOME}/.config/FreeCAD
46blacklist ${HOME}/.config/Fritzing
44blacklist ${HOME}/.config/Gitter 47blacklist ${HOME}/.config/Gitter
45blacklist ${HOME}/.config/Google 48blacklist ${HOME}/.config/Google
46blacklist ${HOME}/.config/Google Play Music Desktop Player 49blacklist ${HOME}/.config/Google Play Music Desktop Player
@@ -155,6 +158,7 @@ blacklist ${HOME}/.config/netsurf
155blacklist ${HOME}/.config/nheko 158blacklist ${HOME}/.config/nheko
156blacklist ${HOME}/.config/okularpartrc 159blacklist ${HOME}/.config/okularpartrc
157blacklist ${HOME}/.config/okularrc 160blacklist ${HOME}/.config/okularrc
161blacklist ${HOME}/.config/onionshare
158blacklist ${HOME}/.config/opera 162blacklist ${HOME}/.config/opera
159blacklist ${HOME}/.config/opera-beta 163blacklist ${HOME}/.config/opera-beta
160blacklist ${HOME}/.config/orage 164blacklist ${HOME}/.config/orage
@@ -162,6 +166,7 @@ blacklist ${HOME}/.config/org.kde.gwenviewrc
162blacklist ${HOME}/.config/pcmanfm 166blacklist ${HOME}/.config/pcmanfm
163blacklist ${HOME}/.config/pdfmod 167blacklist ${HOME}/.config/pdfmod
164blacklist ${HOME}/.config/Pinta 168blacklist ${HOME}/.config/Pinta
169blacklist ${HOME}/.config/pitivi
165blacklist ${HOME}/.config/pix 170blacklist ${HOME}/.config/pix
166blacklist ${HOME}/.config/pluma 171blacklist ${HOME}/.config/pluma
167blacklist ${HOME}/.config/psi+ 172blacklist ${HOME}/.config/psi+
diff --git a/etc/discord-canary.profile b/etc/discord-canary.profile
new file mode 100644
index 000000000..391af668e
--- /dev/null
+++ b/etc/discord-canary.profile
@@ -0,0 +1,23 @@
1# Firejail profile for discord-canary
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/discord-canary.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8include /etc/firejail/disable-common.inc
9include /etc/firejail/disable-passwdmgr.inc
10include /etc/firejail/disable-programs.inc
11
12whitelist ${DOWNLOADS}
13whitelist ${HOME}/.config/discordcanary
14
15caps.drop all
16netfilter
17nodvd
18nogroups
19nonewprivs
20noroot
21notv
22protocol unix,inet,inet6,netlink
23seccomp
diff --git a/etc/evince.profile b/etc/evince.profile
index 679aac08a..bbf0505cf 100644
--- a/etc/evince.profile
+++ b/etc/evince.profile
@@ -36,7 +36,7 @@ tracelog
36private-bin evince,evince-previewer,evince-thumbnailer 36private-bin evince,evince-previewer,evince-thumbnailer
37private-dev 37private-dev
38private-etc fonts 38private-etc fonts
39private-lib 39#private-lib - seems to be breaking on Gnome Shell 3.26.2, Mutter WM, issue 1711
40private-tmp 40private-tmp
41 41
42memory-deny-write-execute 42memory-deny-write-execute
diff --git a/etc/firefox-developer-edition.profile b/etc/firefox-developer-edition.profile
new file mode 100644
index 000000000..696f95b56
--- /dev/null
+++ b/etc/firefox-developer-edition.profile
@@ -0,0 +1,10 @@
1# Firejail profile for firefox-developer-edition
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/firefox-developer-edition.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8
9# Redirect
10include /etc/firejail/firefox.profile
diff --git a/etc/firefox.profile b/etc/firefox.profile
index be7fdb12c..079cb1536 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -88,7 +88,7 @@ disable-mnt
88# private-bin firefox,which,sh,dbus-launch,dbus-send,env,bash 88# private-bin firefox,which,sh,dbus-launch,dbus-send,env,bash
89private-dev 89private-dev
90# private-etc below works fine on most distributions. There are some problems on CentOS. 90# private-etc below works fine on most distributions. There are some problems on CentOS.
91# private-etc iceweasel,ca-certificates,ssl,machine-id,dconf,selinux,passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,xdg,gtk-2.0,gtk-3.0,X11,pango,fonts,firefox,mime.types,mailcap,asound.conf,pulse 91# private-etc iceweasel,ca-certificates,ssl,machine-id,dconf,selinux,passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,xdg,gtk-2.0,gtk-3.0,X11,pango,fonts,firefox,mime.types,mailcap,asound.conf,pulse,pki,crypto-policies
92private-tmp 92private-tmp
93 93
94noexec ${HOME} 94noexec ${HOME}
diff --git a/etc/ideaIC.profile b/etc/ideaIC.profile
new file mode 100644
index 000000000..f7a69fa94
--- /dev/null
+++ b/etc/ideaIC.profile
@@ -0,0 +1,10 @@
1# Firejail profile for ideaIC
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/ideaIC.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8
9# Redirect
10include /etc/firejail/idea.sh.profile
diff --git a/etc/kwin_x11.profile b/etc/kwin_x11.profile
index 3ce4fe80d..91bb62efc 100644
--- a/etc/kwin_x11.profile
+++ b/etc/kwin_x11.profile
@@ -36,8 +36,5 @@ private-dev
36private-etc drirc,fonts,ld.so.cache,machine-id,xdg 36private-etc drirc,fonts,ld.so.cache,machine-id,xdg
37private-tmp 37private-tmp
38 38
39# disable QML disk caching as it conflicts with the noexec constraints below
40env QML_DISABLE_DISK_CACHE=1
41
42noexec ${HOME} 39noexec ${HOME}
43noexec /tmp 40noexec /tmp
diff --git a/etc/lollypop.profile b/etc/lollypop.profile
index c0c762c02..f42489cd3 100644
--- a/etc/lollypop.profile
+++ b/etc/lollypop.profile
@@ -25,7 +25,7 @@ seccomp
25shell none 25shell none
26 26
27private-dev 27private-dev
28private-etc asound.conf,ca-certificates,fonts,host.conf,hostname,hosts,pulse,resolv.conf,ssl 28private-etc asound.conf,ca-certificates,fonts,host.conf,hostname,hosts,pulse,resolv.conf,ssl,pki,crypto-policies,gtk-3.0,xdg,machine-id
29private-tmp 29private-tmp
30 30
31noexec ${HOME} 31noexec ${HOME}
diff --git a/etc/minetest.profile b/etc/minetest.profile
index aa4c2218d..c560ac47c 100644
--- a/etc/minetest.profile
+++ b/etc/minetest.profile
@@ -33,7 +33,7 @@ disable-mnt
33private-bin minetest 33private-bin minetest
34private-dev 34private-dev
35# private-etc needs to be updated, see #1702 35# private-etc needs to be updated, see #1702
36#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl 36#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies
37private-tmp 37private-tmp
38 38
39noexec ${HOME} 39noexec ${HOME}
diff --git a/etc/okular.profile b/etc/okular.profile
index 59c93bdb0..31b773852 100644
--- a/etc/okular.profile
+++ b/etc/okular.profile
@@ -43,10 +43,7 @@ tracelog
43private-bin okular,kbuildsycoca4,kdeinit4,lpr 43private-bin okular,kbuildsycoca4,kdeinit4,lpr
44private-dev 44private-dev
45private-etc alternatives,cups,fonts,ld.so.cache,machine-id 45private-etc alternatives,cups,fonts,ld.so.cache,machine-id
46# private-tmp - on KDE we need access to the real /tmp for data exchange with thunderbird 46# private-tmp - on KDE we need access to the real /tmp for data exchange with email clients
47
48# disable QML disk caching as it conflicts with the noexec constraints below
49env QML_DISABLE_DISK_CACHE=1
50 47
51# memory-deny-write-execute 48# memory-deny-write-execute
52noexec ${HOME} 49noexec ${HOME}
diff --git a/etc/onionshare-gui.profile b/etc/onionshare-gui.profile
new file mode 100644
index 000000000..7220f7e1c
--- /dev/null
+++ b/etc/onionshare-gui.profile
@@ -0,0 +1,35 @@
1# Firejail profile for onionshare-gui
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/onionshare-gui.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8noblacklist ${HOME}/.config/onionshare
9
10include /etc/firejail/disable-common.inc
11include /etc/firejail/disable-devel.inc
12include /etc/firejail/disable-passwdmgr.inc
13include /etc/firejail/disable-programs.inc
14
15caps.drop all
16ipc-namespace
17netfilter
18no3d
19nodvd
20nogroups
21nonewprivs
22noroot
23nosound
24notv
25novideo
26protocol unix,inet,inet6
27seccomp
28shell none
29
30private-dev
31private-tmp
32
33memory-deny-write-execute
34noexec ${HOME}
35noexec /tmp
diff --git a/etc/pitivi.profile b/etc/pitivi.profile
new file mode 100644
index 000000000..f2640ed66
--- /dev/null
+++ b/etc/pitivi.profile
@@ -0,0 +1,33 @@
1# Firejail profile for pitivi
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/pitivi.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8
9noblacklist ${HOME}/.config/pitivi
10
11include /etc/firejail/disable-common.inc
12include /etc/firejail/disable-devel.inc
13include /etc/firejail/disable-passwdmgr.inc
14include /etc/firejail/disable-programs.inc
15
16caps.drop all
17ipc-namespace
18netfilter
19nodvd
20nogroups
21nonewprivs
22noroot
23notv
24novideo
25protocol unix
26seccomp
27shell none
28
29private-dev
30private-tmp
31
32noexec ${HOME}
33noexec /tmp
diff --git a/etc/pycharm-community.profile b/etc/pycharm-community.profile
new file mode 100644
index 000000000..b5e508d06
--- /dev/null
+++ b/etc/pycharm-community.profile
@@ -0,0 +1,32 @@
1# Firejail profile for pycharm-community
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/pycharm-community.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8noblacklist ${HOME}/snap
9noblacklist ${HOME}/.PyCharmCE*
10noblacklist ${HOME}/.java
11
12include /etc/firejail/disable-common.inc
13include /etc/firejail/disable-devel.inc
14include /etc/firejail/disable-passwdmgr.inc
15include /etc/firejail/disable-programs.inc
16
17caps.drop all
18machine-id
19nodvd
20nogroups
21nosound
22notv
23novideo
24shell none
25tracelog
26
27# private-etc fonts,passwd - minimal required to run but will probably break
28# program!
29private-dev
30private-tmp
31
32noexec /tmp
diff --git a/etc/pycharm-professional.profile b/etc/pycharm-professional.profile
new file mode 100644
index 000000000..b28082dc4
--- /dev/null
+++ b/etc/pycharm-professional.profile
@@ -0,0 +1,7 @@
1# Firejail profilen alias for pycharm-professional
2# This file is overwritten after every install/update
3
4noblacklist ${HOME}/.PyCharm*
5
6# Redirect
7include /etc/firejail/pycharm-community.profile
diff --git a/etc/quiterss.profile b/etc/quiterss.profile
index 0d02cacae..94c64f2dd 100644
--- a/etc/quiterss.profile
+++ b/etc/quiterss.profile
@@ -44,7 +44,7 @@ tracelog
44disable-mnt 44disable-mnt
45private-bin quiterss 45private-bin quiterss
46private-dev 46private-dev
47# private-etc X11,ssl 47# private-etc X11,ssl,pki,ca-certificates,crypto-policies
48 48
49noexec ${HOME} 49noexec ${HOME}
50noexec /tmp 50noexec /tmp
diff --git a/etc/slack.profile b/etc/slack.profile
index faf875cf1..da1f86638 100644
--- a/etc/slack.profile
+++ b/etc/slack.profile
@@ -36,5 +36,5 @@ shell none
36disable-mnt 36disable-mnt
37private-bin slack 37private-bin slack
38private-dev 38private-dev
39private-etc asound.conf,ca-certificates,fonts,group,passwd,pulse,resolv.conf,ssl,ld.so.conf,ld.so.cache,localtime 39private-etc asound.conf,ca-certificates,fonts,group,passwd,pulse,resolv.conf,ssl,ld.so.conf,ld.so.cache,localtime,pki,crypto-policies
40private-tmp 40private-tmp
diff --git a/etc/steam.profile b/etc/steam.profile
index a683bcc19..1e0fd57d1 100644
--- a/etc/steam.profile
+++ b/etc/steam.profile
@@ -47,5 +47,5 @@ shell none
47# private-dev should be commented for controllers 47# private-dev should be commented for controllers
48private-dev 48private-dev
49# private-etc breaks some games 49# private-etc breaks some games
50#private-etc asound.conf,ca-certificates,dbus-1,drirc,fonts,group,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,ld.so.conf,ld.so.conf.d,localtime,lsb-release,machine-id,mime.types,passwd,pulse,resolv.conf,ssl,services 50#private-etc asound.conf,ca-certificates,dbus-1,drirc,fonts,group,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,ld.so.conf,ld.so.conf.d,localtime,lsb-release,machine-id,mime.types,passwd,pulse,resolv.conf,ssl,pki,services,crypto-policies
51private-tmp 51private-tmp
diff --git a/etc/surf.profile b/etc/surf.profile
index 7dcbc280e..b91c09885 100644
--- a/etc/surf.profile
+++ b/etc/surf.profile
@@ -29,7 +29,7 @@ tracelog
29disable-mnt 29disable-mnt
30private-bin ls,surf,sh,bash,curl,dmenu,printf,sed,sleep,st,stterm,xargs,xprop 30private-bin ls,surf,sh,bash,curl,dmenu,printf,sed,sleep,st,stterm,xargs,xprop
31private-dev 31private-dev
32private-etc passwd,group,hosts,resolv.conf,fonts,ssl 32private-etc passwd,group,hosts,resolv.conf,fonts,ssl,pki,ca-certificates,crypto-policies
33private-tmp 33private-tmp
34 34
35noexec ${HOME} 35noexec ${HOME}
diff --git a/etc/terasology.profile b/etc/terasology.profile
index 02a7baeb7..3d27134c4 100644
--- a/etc/terasology.profile
+++ b/etc/terasology.profile
@@ -37,7 +37,7 @@ shell none
37 37
38disable-mnt 38disable-mnt
39private-dev 39private-dev
40private-etc asound.conf,ca-certificates,dbus-1,drirc,fonts,group,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,lsb-release,machine-id,mime.types,passwd,pulse,resolv.conf,ssl,java-8-openjdk,java-7-openjdk 40private-etc asound.conf,ca-certificates,dbus-1,drirc,fonts,group,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,lsb-release,machine-id,mime.types,passwd,pulse,resolv.conf,ssl,java-8-openjdk,java-7-openjdk,pki,crypto-policies
41private-tmp 41private-tmp
42 42
43noexec ${HOME} 43noexec ${HOME}
diff --git a/etc/torbrowser-launcher.profile b/etc/torbrowser-launcher.profile
index 51a5d7735..b802478a2 100644
--- a/etc/torbrowser-launcher.profile
+++ b/etc/torbrowser-launcher.profile
@@ -33,7 +33,7 @@ tracelog
33disable-mnt 33disable-mnt
34private-bin bash,cp,dirname,env,expr,file,getconf,gpg,grep,id,ln,mkdir,python*,readlink,rm,sed,sh,tail,test,tor-browser-en,torbrowser-launcher 34private-bin bash,cp,dirname,env,expr,file,getconf,gpg,grep,id,ln,mkdir,python*,readlink,rm,sed,sh,tail,test,tor-browser-en,torbrowser-launcher
35private-dev 35private-dev
36private-etc fonts 36private-etc fonts,hostname,hosts,resolv.conf,pki,ssl,ca-certificates,crypto-policies
37private-tmp 37private-tmp
38 38
39noexec /tmp 39noexec /tmp
diff --git a/etc/transmission-qt.profile b/etc/transmission-qt.profile
index 0fe124631..b5a41622d 100644
--- a/etc/transmission-qt.profile
+++ b/etc/transmission-qt.profile
@@ -40,4 +40,5 @@ private-dev
40# private-lib - problems on Arch 40# private-lib - problems on Arch
41private-tmp 41private-tmp
42 42
43memory-deny-write-execute 43# memory-deny-write-execute - problems on Qt 5.10.0, KDE Frameworks 5.41.0
44
diff --git a/etc/w3m.profile b/etc/w3m.profile
index 2d56aa660..d35ed9ae0 100644
--- a/etc/w3m.profile
+++ b/etc/w3m.profile
@@ -31,5 +31,5 @@ tracelog
31 31
32# private-bin w3m 32# private-bin w3m
33private-dev 33private-dev
34private-etc resolv.conf,ssl 34private-etc resolv.conf,ssl,pki,ca-certificates,crypto-policies
35private-tmp 35private-tmp
diff --git a/etc/xonotic.profile b/etc/xonotic.profile
index b3d45dc71..d17d2b612 100644
--- a/etc/xonotic.profile
+++ b/etc/xonotic.profile
@@ -32,7 +32,7 @@ disable-mnt
32private-bin bash,blind-id,darkplaces-glx,darkplaces-sdl,dirname,grep,ldd,netstat,ps,readlink,sh,uname,xonotic,xonotic-glx,xonotic-linux32-dedicated,xonotic-linux32-glx,xonotic-linux32-sdl,xonotic-linux64-dedicated,xonotic-linux64-glx,xonotic-linux64-sdl,xonotic-sdl 32private-bin bash,blind-id,darkplaces-glx,darkplaces-sdl,dirname,grep,ldd,netstat,ps,readlink,sh,uname,xonotic,xonotic-glx,xonotic-linux32-dedicated,xonotic-linux32-glx,xonotic-linux32-sdl,xonotic-linux64-dedicated,xonotic-linux64-glx,xonotic-linux64-sdl,xonotic-sdl
33private-dev 33private-dev
34# private-etc breaks audio on some distros 34# private-etc breaks audio on some distros
35#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl 35#private-etc asound.conf,ca-certificates,drirc,fonts,group,host.conf,hostname,hosts,ld.so.cache,ld.so.preload,localtime,nsswitch.conf,passwd,pulse,resolv.conf,ssl,pki,crypto-policies
36private-tmp 36private-tmp
37 37
38noexec ${HOME} 38noexec ${HOME}
diff --git a/src/faudit/caps.c b/src/faudit/caps.c
index d4a98676c..46c262c89 100644
--- a/src/faudit/caps.c
+++ b/src/faudit/caps.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/dbus.c b/src/faudit/dbus.c
index 54300c9b8..cb08b9b0b 100644
--- a/src/faudit/dbus.c
+++ b/src/faudit/dbus.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/dev.c b/src/faudit/dev.c
index 6bafaf93e..7bf4b279c 100644
--- a/src/faudit/dev.c
+++ b/src/faudit/dev.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/faudit.h b/src/faudit/faudit.h
index 16a13d0ff..180121ec1 100644
--- a/src/faudit/faudit.h
+++ b/src/faudit/faudit.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/files.c b/src/faudit/files.c
index aa5b3aafb..1ba18f2ab 100644
--- a/src/faudit/files.c
+++ b/src/faudit/files.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/main.c b/src/faudit/main.c
index 57c709767..d73986843 100644
--- a/src/faudit/main.c
+++ b/src/faudit/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/network.c b/src/faudit/network.c
index 797c15ba8..54eef2b2a 100644
--- a/src/faudit/network.c
+++ b/src/faudit/network.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/pid.c b/src/faudit/pid.c
index 0aa2ddd44..22bb68c1a 100644
--- a/src/faudit/pid.c
+++ b/src/faudit/pid.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/seccomp.c b/src/faudit/seccomp.c
index 2e9665fd9..85a883618 100644
--- a/src/faudit/seccomp.c
+++ b/src/faudit/seccomp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/syscall.c b/src/faudit/syscall.c
index 9661f81e6..3650590f3 100644
--- a/src/faudit/syscall.c
+++ b/src/faudit/syscall.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/faudit/x11.c b/src/faudit/x11.c
index f0cc0eed4..bb763b110 100644
--- a/src/faudit/x11.c
+++ b/src/faudit/x11.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/build_bin.c b/src/fbuilder/build_bin.c
index b69e089c3..1230fb780 100644
--- a/src/fbuilder/build_bin.c
+++ b/src/fbuilder/build_bin.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index 3f685623e..771dc94cb 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c
index 18bf5d702..7470a8d10 100644
--- a/src/fbuilder/build_home.c
+++ b/src/fbuilder/build_home.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index 5fead41c5..125487c41 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c
index 85190f0f2..fbc0e06f4 100644
--- a/src/fbuilder/build_seccomp.c
+++ b/src/fbuilder/build_seccomp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/fbuilder.h b/src/fbuilder/fbuilder.h
index 711167704..0a0fd42c9 100644
--- a/src/fbuilder/fbuilder.h
+++ b/src/fbuilder/fbuilder.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/filedb.c b/src/fbuilder/filedb.c
index 6b57954d3..7af3724e8 100644
--- a/src/fbuilder/filedb.c
+++ b/src/fbuilder/filedb.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/main.c b/src/fbuilder/main.c
index 697b53700..ef5dee7d9 100644
--- a/src/fbuilder/main.c
+++ b/src/fbuilder/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fbuilder/utils.c b/src/fbuilder/utils.c
index c07d2e925..1d490b07e 100644
--- a/src/fbuilder/utils.c
+++ b/src/fbuilder/utils.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fcopy/main.c b/src/fcopy/main.c
index 913234702..e93cd1cb8 100644
--- a/src/fcopy/main.c
+++ b/src/fcopy/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c
index af509da13..0a6a0bbf0 100644
--- a/src/firecfg/desktop_files.c
+++ b/src/firecfg/desktop_files.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 1b87c43cd..1cd9d9c1f 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -7,6 +7,7 @@
72048-qt 72048-qt
8Cyberfox 8Cyberfox
9FossaMail 9FossaMail
10Fritzing
10Mathematica 11Mathematica
11Natron 12Natron
12Telegram 13Telegram
@@ -21,6 +22,7 @@ amule
21android-studio 22android-studio
22apktool 23apktool
23arch-audit 24arch-audit
25archaudit-report
24ardour4 26ardour4
25ardour5 27ardour5
26arduino 28arduino
@@ -42,6 +44,7 @@ bleachbit
42blender 44blender
43bless 45bless
44bluefish 46bluefish
47bnox
45brackets 48brackets
46brasero 49brasero
47brave 50brave
@@ -82,6 +85,7 @@ dia
82digikam 85digikam
83dillo 86dillo
84dino 87dino
88discord-canary
85display 89display
86dnscrypt-proxy 90dnscrypt-proxy
87dnsmasq 91dnsmasq
@@ -94,6 +98,7 @@ dropbox
94ebook-viewer 98ebook-viewer
95elinks 99elinks
96empathy 100empathy
101enpass
97eog 102eog
98eom 103eom
99epiphany 104epiphany
@@ -107,6 +112,7 @@ ffmpeg
107file-roller 112file-roller
108filezilla 113filezilla
109firefox 114firefox
115firefox-developer-edition
110firefox-esr 116firefox-esr
111firefox-nightly 117firefox-nightly
112flashpeak-slimjet 118flashpeak-slimjet
@@ -169,6 +175,7 @@ icecat
169icedove 175icedove
170iceweasel 176iceweasel
171idea.sh 177idea.sh
178ideaIC
172imagej 179imagej
173img2txt 180img2txt
174inkscape 181inkscape
@@ -249,6 +256,7 @@ nylas
249obs 256obs
250odt2txt 257odt2txt
251okular 258okular
259onionshare-gui
252open-invaders 260open-invaders
253openshot 261openshot
254openshot-qt 262openshot-qt
@@ -267,10 +275,13 @@ ping
267pingus 275pingus
268pinta 276pinta
269pithos 277pithos
278pitivi
270pix 279pix
280playonlinux
271pluma 281pluma
272polari 282polari
273psi-plus 283psi-plus
284# pycharm-community - FB note: may enable later
274qbittorrent 285qbittorrent
275qemu-launcher 286qemu-launcher
276qlipper 287qlipper
@@ -304,6 +315,7 @@ skype
304skypeforlinux 315skypeforlinux
305slack 316slack
306smplayer 317smplayer
318smtube
307soffice 319soffice
308soundconverter 320soundconverter
309spotify 321spotify
@@ -315,13 +327,30 @@ steam
315stellarium 327stellarium
316strings 328strings
317supertux2 329supertux2
330surf
331sylpheed
318synfigstudio 332synfigstudio
319teamspeak3 333teamspeak3
320telegram 334telegram
321telegram-desktop 335telegram-desktop
322terasology 336terasology
323thunderbird 337thunderbird
338tor-browser-ar
324tor-browser-en 339tor-browser-en
340tor-browser-en-us
341tor-browser-es-es
342tor-browser-es
343tor-browser-fa
344tor-browser-fr
345tor-browser-it
346tor-browser-ja
347tor-browser-ko
348torbrowser-launcher
349tor-browser-pl
350tor-browser-pt-br
351tor-browser-ru
352tor-browser-vi
353tor-browser-zh-cn
325totem 354totem
326tracker 355tracker
327transmission-cli 356transmission-cli
diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h
index c4640feb8..5f377bc25 100644
--- a/src/firecfg/firecfg.h
+++ b/src/firecfg/firecfg.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 090905a85..ab0fd53e3 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firecfg/sound.c b/src/firecfg/sound.c
index 9dfb305cd..a4151e405 100644
--- a/src/firecfg/sound.c
+++ b/src/firecfg/sound.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firecfg/util.c b/src/firecfg/util.c
index 4520e75e8..f0446ca8d 100644
--- a/src/firecfg/util.c
+++ b/src/firecfg/util.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/appimage.c b/src/firejail/appimage.c
index 098601b6c..7436b7755 100644
--- a/src/firejail/appimage.c
+++ b/src/firejail/appimage.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/appimage_size.c b/src/firejail/appimage_size.c
index c750f9028..a20dbba6c 100644
--- a/src/firejail/appimage_size.c
+++ b/src/firejail/appimage_size.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/arp.c b/src/firejail/arp.c
index ffbc56841..c19cb0a47 100644
--- a/src/firejail/arp.c
+++ b/src/firejail/arp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c
index 24d027d54..542faa06e 100644
--- a/src/firejail/bandwidth.c
+++ b/src/firejail/bandwidth.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/caps.c b/src/firejail/caps.c
index 14f981a86..dae45d9df 100644
--- a/src/firejail/caps.c
+++ b/src/firejail/caps.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017Firejail Authors 2 * Copyright (C) 2014-2018Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/cgroup.c b/src/firejail/cgroup.c
index 8d6496aab..8eb61bf78 100644
--- a/src/firejail/cgroup.c
+++ b/src/firejail/cgroup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 12e6d307a..2629fb3ec 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c
index 114173b6a..ce1e281a5 100644
--- a/src/firejail/cmdline.c
+++ b/src/firejail/cmdline.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/cpu.c b/src/firejail/cpu.c
index 6b3fc063d..8f72fb69e 100644
--- a/src/firejail/cpu.c
+++ b/src/firejail/cpu.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/env.c b/src/firejail/env.c
index b2e4c17f3..ad9f736b0 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -116,9 +116,13 @@ void env_ibus_load(void) {
116 116
117// default sandbox env variables 117// default sandbox env variables
118void env_defaults(void) { 118void env_defaults(void) {
119 // fix qt 4.8 119 // Qt fixes
120 if (setenv("QT_X11_NO_MITSHM", "1", 1) < 0) 120 if (setenv("QT_X11_NO_MITSHM", "1", 1) < 0)
121 errExit("setenv"); 121 errExit("setenv");
122 if (setenv("QML_DISABLE_DISK_CACHE", "1", 1) < 0)
123 errExit("setenv");
124// if (setenv("QTWEBENGINE_DISABLE_SANDBOX", "1", 1) < 0)
125// errExit("setenv");
122// if (setenv("MOZ_NO_REMOTE, "1", 1) < 0) 126// if (setenv("MOZ_NO_REMOTE, "1", 1) < 0)
123// errExit("setenv"); 127// errExit("setenv");
124 if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc, 128 if (setenv("container", "firejail", 1) < 0) // LXC sets container=lxc,
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index a009c4e65..5d586830a 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -240,9 +240,10 @@ typedef struct config_t {
240 Interface interface1; 240 Interface interface1;
241 Interface interface2; 241 Interface interface2;
242 Interface interface3; 242 Interface interface3;
243 uint32_t dns1; // up to 3 IP addresses for dns servers 243 char *dns1; // up to 4 IP (v4/v6) addresses for dns servers
244 uint32_t dns2; 244 char *dns2;
245 uint32_t dns3; 245 char *dns3;
246 char *dns4;
246 247
247 // seccomp 248 // seccomp
248 char *seccomp_list;// optional seccomp list on top of default filter 249 char *seccomp_list;// optional seccomp list on top of default filter
@@ -409,6 +410,7 @@ void net_dns_print(pid_t pid);
409void network_main(pid_t child); 410void network_main(pid_t child);
410 411
411// network.c 412// network.c
413int check_ip46_address(const char *addr);
412void net_if_up(const char *ifname); 414void net_if_up(const char *ifname);
413void net_if_down(const char *ifname); 415void net_if_down(const char *ifname);
414void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu); 416void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu);
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 29bac878a..68e5c7d3a 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index 38110a75d..d4cdbbe0a 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index cc3bc72b2..1039b151b 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -319,7 +319,7 @@ static void disable_file_or_dir(const char *fname) {
319} 319}
320 320
321void fs_dev_disable_sound(void) { 321void fs_dev_disable_sound(void) {
322 int i = 0; 322 unsigned i = 0;
323 while (dev[i].dev_fname != NULL) { 323 while (dev[i].dev_fname != NULL) {
324 if (dev[i].type == DEV_SOUND) 324 if (dev[i].type == DEV_SOUND)
325 disable_file_or_dir(dev[i].dev_fname); 325 disable_file_or_dir(dev[i].dev_fname);
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index dfaa1fdcf..8847e44e7 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index 5a39fab48..3afa3bf0c 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c
index 97ce468a6..fd823b812 100644
--- a/src/firejail/fs_hostname.c
+++ b/src/firejail/fs_hostname.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -89,7 +89,7 @@ errexit:
89} 89}
90 90
91void fs_resolvconf(void) { 91void fs_resolvconf(void) {
92 if (cfg.dns1 == 0) 92 if (cfg.dns1 == NULL)
93 return; 93 return;
94 94
95 if (arg_debug) 95 if (arg_debug)
@@ -164,11 +164,13 @@ void fs_resolvconf(void) {
164 } 164 }
165 165
166 if (cfg.dns1) 166 if (cfg.dns1)
167 fprintf(fp, "nameserver %d.%d.%d.%d\n", PRINT_IP(cfg.dns1)); 167 fprintf(fp, "nameserver %s\n", cfg.dns1);
168 if (cfg.dns2) 168 if (cfg.dns2)
169 fprintf(fp, "nameserver %d.%d.%d.%d\n", PRINT_IP(cfg.dns2)); 169 fprintf(fp, "nameserver %s\n", cfg.dns2);
170 if (cfg.dns3) 170 if (cfg.dns3)
171 fprintf(fp, "nameserver %d.%d.%d.%d\n", PRINT_IP(cfg.dns3)); 171 fprintf(fp, "nameserver %s\n", cfg.dns3);
172 if (cfg.dns4)
173 fprintf(fp, "nameserver %s\n", cfg.dns4);
172 174
173 // mode and owner 175 // mode and owner
174 SET_PERMS_STREAM(fp, 0, 0, 0644); 176 SET_PERMS_STREAM(fp, 0, 0, 0644);
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index ad86d1fd8..f7351339c 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -297,9 +297,10 @@ void fs_private_lib(void) {
297 if (lib) { 297 if (lib) {
298 if (is_dir(lib)) 298 if (is_dir(lib))
299 fslib_copy_dir(lib); 299 fslib_copy_dir(lib);
300 else 300 else {
301 fslib_duplicate(lib);
301 fslib_copy_libs(lib); 302 fslib_copy_libs(lib);
302 fslib_copy_libs(lib); 303 }
303 free(lib); 304 free(lib);
304 } 305 }
305 306
@@ -308,9 +309,10 @@ void fs_private_lib(void) {
308 if (lib) { 309 if (lib) {
309 if (is_dir(lib)) 310 if (is_dir(lib))
310 fslib_copy_dir(lib); 311 fslib_copy_dir(lib);
311 else 312 else {
312 fslib_duplicate(lib); 313 fslib_duplicate(lib);
313 fslib_copy_libs(lib); 314 fslib_copy_libs(lib);
315 }
314 free(lib); 316 free(lib);
315 } 317 }
316 } 318 }
@@ -341,28 +343,22 @@ void fs_private_lib(void) {
341 char *name; 343 char *name;
342 if (asprintf(&name, "/usr/lib/%s", ptr) == -1) 344 if (asprintf(&name, "/usr/lib/%s", ptr) == -1)
343 errExit("asprintf"); 345 errExit("asprintf");
344 if (is_dir(name)) { 346 if (is_dir(name))
345 fslib_copy_dir(name); 347 fslib_copy_dir(name);
346 fslib_copy_libs(name);
347 }
348 free(name); 348 free(name);
349 349
350 // /usr/lib/x86_linux-gnu - debian & frriends 350 // /usr/lib/x86_linux-gnu - debian & frriends
351 if (asprintf(&name, "/usr/lib/x86_64-linux-gnu/%s", ptr) == -1) 351 if (asprintf(&name, "/usr/lib/x86_64-linux-gnu/%s", ptr) == -1)
352 errExit("asprintf"); 352 errExit("asprintf");
353 if (is_dir(name)) { 353 if (is_dir(name))
354 fslib_copy_dir(name); 354 fslib_copy_dir(name);
355 fslib_copy_libs(name);
356 }
357 free(name); 355 free(name);
358 356
359 // /usr/lib64 - CentOS, Fedora 357 // /usr/lib64 - CentOS, Fedora
360 if (asprintf(&name, "/usr/lib64/%s", ptr) == -1) 358 if (asprintf(&name, "/usr/lib64/%s", ptr) == -1)
361 errExit("asprintf"); 359 errExit("asprintf");
362 if (is_dir(name)) { 360 if (is_dir(name))
363 fslib_copy_dir(name); 361 fslib_copy_dir(name);
364 fslib_copy_libs(name);
365 }
366 free(name); 362 free(name);
367 } 363 }
368 } 364 }
diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c
index e2780afca..ea5edfabe 100644
--- a/src/firejail/fs_lib2.c
+++ b/src/firejail/fs_lib2.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c
index 354e720a1..93f28a26b 100644
--- a/src/firejail/fs_logger.c
+++ b/src/firejail/fs_logger.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c
index 7975ae323..9d22093ee 100644
--- a/src/firejail/fs_mkdir.c
+++ b/src/firejail/fs_mkdir.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index 472b69cb2..38ab7e2f8 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_var.c b/src/firejail/fs_var.c
index 11e9eabf5..9fbbdfa8f 100644
--- a/src/firejail/fs_var.c
+++ b/src/firejail/fs_var.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index da796f60f..6cc0a3b2b 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/git.c b/src/firejail/git.c
index ae28f7ec1..d6525aa89 100644
--- a/src/firejail/git.c
+++ b/src/firejail/git.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/join.c b/src/firejail/join.c
index e255161da..a21293214 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/ls.c b/src/firejail/ls.c
index 7b994b835..79e4b679b 100644
--- a/src/firejail/ls.c
+++ b/src/firejail/ls.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/main.c b/src/firejail/main.c
index d0d80e62c..9cd89d42c 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -2034,18 +2034,20 @@ int main(int argc, char **argv) {
2034 fprintf(stderr, "Error: no network device configured\n"); 2034 fprintf(stderr, "Error: no network device configured\n");
2035 exit(1); 2035 exit(1);
2036 } 2036 }
2037 if (br->arg_ip_none || br->ip6sandbox) { 2037 if (br->ip6sandbox) {
2038 fprintf(stderr, "Error: cannot configure the IP address twice for the same interface\n"); 2038 fprintf(stderr, "Error: cannot configure the IP address twice for the same interface\n");
2039 exit(1); 2039 exit(1);
2040 } 2040 }
2041 2041
2042 // configure this IP address for the last bridge defined 2042 // configure this IP address for the last bridge defined
2043 // todo: verify ipv6 syntax 2043 if (check_ip46_address(argv[i] + 6) == 0) {
2044 br->ip6sandbox = argv[i] + 6; 2044 fprintf(stderr, "Error: invalid IPv6 address\n");
2045// if (atoip(argv[i] + 5, &br->ipsandbox)) { 2045 exit(1);
2046// fprintf(stderr, "Error: invalid IP address\n"); 2046 }
2047// exit(1); 2047
2048// } 2048 br->ip6sandbox = strdup(argv[i] + 6);
2049 if (br->ip6sandbox == NULL)
2050 errExit("strdup");
2049 } 2051 }
2050 else 2052 else
2051 exit_err_feature("networking"); 2053 exit_err_feature("networking");
@@ -2064,20 +2066,24 @@ int main(int argc, char **argv) {
2064 } 2066 }
2065#endif 2067#endif
2066 else if (strncmp(argv[i], "--dns=", 6) == 0) { 2068 else if (strncmp(argv[i], "--dns=", 6) == 0) {
2067 uint32_t dns; 2069 if (check_ip46_address(argv[i] + 6) == 0) {
2068 if (atoip(argv[i] + 6, &dns)) { 2070 fprintf(stderr, "Error: invalid DNS server IPv4 or IPv6 address\n");
2069 fprintf(stderr, "Error: invalid DNS server IP address\n"); 2071 exit(1);
2070 return 1;
2071 } 2072 }
2073 char *dns = strdup(argv[i] + 6);
2074 if (!dns)
2075 errExit("strdup");
2072 2076
2073 if (cfg.dns1 == 0) 2077 if (cfg.dns1 == NULL)
2074 cfg.dns1 = dns; 2078 cfg.dns1 = dns;
2075 else if (cfg.dns2 == 0) 2079 else if (cfg.dns2 == NULL)
2076 cfg.dns2 = dns; 2080 cfg.dns2 = dns;
2077 else if (cfg.dns3 == 0) 2081 else if (cfg.dns3 == NULL)
2078 cfg.dns3 = dns; 2082 cfg.dns3 = dns;
2083 else if (cfg.dns4 == NULL)
2084 cfg.dns4 = dns;
2079 else { 2085 else {
2080 fprintf(stderr, "Error: up to 3 DNS servers can be specified\n"); 2086 fprintf(stderr, "Error: up to 4 DNS servers can be specified\n");
2081 return 1; 2087 return 1;
2082 } 2088 }
2083 } 2089 }
diff --git a/src/firejail/netfilter.c b/src/firejail/netfilter.c
index fd62c3f54..de446d032 100644
--- a/src/firejail/netfilter.c
+++ b/src/firejail/netfilter.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/netns.c b/src/firejail/netns.c
index f52613490..3d8edf5ae 100644
--- a/src/firejail/netns.c
+++ b/src/firejail/netns.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2017 Firejail Authors 2 * Copyright (C) 2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/network.c b/src/firejail/network.c
index f7ddef917..7b84854d3 100644
--- a/src/firejail/network.c
+++ b/src/firejail/network.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -28,6 +28,40 @@
28#include <net/route.h> 28#include <net/route.h>
29#include <linux/if_bridge.h> 29#include <linux/if_bridge.h>
30 30
31// return 1 if addr is a IPv4 or IPv6 address
32int check_ip46_address(const char *addr) {
33 // check ipv4 address
34 uint32_t tmp;
35 if (atoip(addr, &tmp) == 0)
36 return 1;
37
38 // check ipv6 address
39 struct in6_addr result;
40
41 char *tmpstr = strdup(addr);
42 if (!tmpstr)
43 errExit("strdup");
44 char *ptr = strchr(tmpstr, '/');
45 if (ptr) {
46 *ptr = '\0';
47 ptr++;
48 int mask = atoi(ptr);
49 // check the network mask
50 if (mask < 0 || mask > 128) {
51 free(tmpstr);
52 return 0;
53 }
54 }
55 if (inet_pton(AF_INET6, tmpstr, &result) == 1) {
56 free(tmpstr);
57 return 1;
58 }
59
60 free(tmpstr);
61
62 // failed
63 return 0;
64}
31 65
32int net_get_mtu(const char *ifname) { 66int net_get_mtu(const char *ifname) {
33 int mtu = 0; 67 int mtu = 0;
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c
index 2719db958..1516b94d2 100644
--- a/src/firejail/network_main.c
+++ b/src/firejail/network_main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index 83737c73d..ba955bcca 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/output.c b/src/firejail/output.c
index 7d73f1ef2..61c89992d 100644
--- a/src/firejail/output.c
+++ b/src/firejail/output.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/paths.c b/src/firejail/paths.c
index 454255717..121cbeb4a 100644
--- a/src/firejail/paths.c
+++ b/src/firejail/paths.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c
index 6826d830f..d13209873 100644
--- a/src/firejail/preproc.c
+++ b/src/firejail/preproc.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 17a45bf0e..d0c43d13e 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -502,18 +502,20 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
502 fprintf(stderr, "Error: no network device configured\n"); 502 fprintf(stderr, "Error: no network device configured\n");
503 exit(1); 503 exit(1);
504 } 504 }
505 if (br->arg_ip_none || br->ip6sandbox) { 505 if (br->ip6sandbox) {
506 fprintf(stderr, "Error: cannot configure the IP address twice for the same interface\n"); 506 fprintf(stderr, "Error: cannot configure the IP address twice for the same interface\n");
507 exit(1); 507 exit(1);
508 } 508 }
509 509
510 // configure this IP address for the last bridge defined 510 // configure this IP address for the last bridge defined
511 // todo: verify ipv6 syntax 511 if (check_ip46_address(ptr + 4) == 0) {
512 br->ip6sandbox = ptr + 4; 512 fprintf(stderr, "Error: invalid IPv6 address\n");
513// if (atoip(argv[i] + 5, &br->ipsandbox)) { 513 exit(1);
514// fprintf(stderr, "Error: invalid IP address\n"); 514 }
515// exit(1); 515
516// } 516 br->ip6sandbox = strdup(ptr + 4);
517 if (br->ip6sandbox == NULL)
518 errExit("strdup");
517 519
518 } 520 }
519 else 521 else
@@ -668,20 +670,25 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
668 670
669 // dns 671 // dns
670 if (strncmp(ptr, "dns ", 4) == 0) { 672 if (strncmp(ptr, "dns ", 4) == 0) {
671 uint32_t dns; 673
672 if (atoip(ptr + 4, &dns)) { 674 if (check_ip46_address(ptr + 4) == 0) {
673 fprintf(stderr, "Error: invalid DNS server IP address\n"); 675 fprintf(stderr, "Error: invalid DNS server IPv4 or IPv6 address\n");
674 return 1; 676 exit(1);
675 } 677 }
678 char *dns = strdup(ptr + 4);
679 if (!dns)
680 errExit("strdup");
676 681
677 if (cfg.dns1 == 0) 682 if (cfg.dns1 == NULL)
678 cfg.dns1 = dns; 683 cfg.dns1 = dns;
679 else if (cfg.dns2 == 0) 684 else if (cfg.dns2 == NULL)
680 cfg.dns2 = dns; 685 cfg.dns2 = dns;
681 else if (cfg.dns3 == 0) 686 else if (cfg.dns3 == NULL)
682 cfg.dns3 = dns; 687 cfg.dns3 = dns;
688 else if (cfg.dns4 == NULL)
689 cfg.dns4 = dns;
683 else { 690 else {
684 fprintf(stderr, "Error: up to 3 DNS servers can be specified\n"); 691 fprintf(stderr, "Error: up to 4 DNS servers can be specified\n");
685 return 1; 692 return 1;
686 } 693 }
687 return 0; 694 return 0;
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c
index 9524d6617..eb3763253 100644
--- a/src/firejail/protocol.c
+++ b/src/firejail/protocol.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index 6768b525b..ef674fb4a 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/restrict_users.c b/src/firejail/restrict_users.c
index 87ee513af..982dba5ac 100644
--- a/src/firejail/restrict_users.c
+++ b/src/firejail/restrict_users.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/restricted_shell.c b/src/firejail/restricted_shell.c
index d09a2c7e5..9beb01655 100644
--- a/src/firejail/restricted_shell.c
+++ b/src/firejail/restricted_shell.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/rlimit.c b/src/firejail/rlimit.c
index 7206c2cce..e9d459ac2 100644
--- a/src/firejail/rlimit.c
+++ b/src/firejail/rlimit.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/run_symlink.c b/src/firejail/run_symlink.c
index ed885d3b1..7369e15f3 100644
--- a/src/firejail/run_symlink.c
+++ b/src/firejail/run_symlink.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 23cdc07d1..ed0a253b3 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -652,12 +652,14 @@ int sandbox(void* sandbox_arg) {
652 else 652 else
653 fmessage("Default gateway %d.%d.%d.%d\n", PRINT_IP(cfg.defaultgw)); 653 fmessage("Default gateway %d.%d.%d.%d\n", PRINT_IP(cfg.defaultgw));
654 } 654 }
655 if (cfg.dns1 != 0) 655 if (cfg.dns1 != NULL)
656 fmessage("DNS server %d.%d.%d.%d\n", PRINT_IP(cfg.dns1)); 656 fmessage("DNS server %s\n", cfg.dns1);
657 if (cfg.dns2 != 0) 657 if (cfg.dns2 != NULL)
658 fmessage("DNS server %d.%d.%d.%d\n", PRINT_IP(cfg.dns2)); 658 fmessage("DNS server %s\n", cfg.dns2);
659 if (cfg.dns3 != 0) 659 if (cfg.dns3 != NULL)
660 fmessage("DNS server %d.%d.%d.%d\n", PRINT_IP(cfg.dns3)); 660 fmessage("DNS server %s\n", cfg.dns3);
661 if (cfg.dns4 != NULL)
662 fmessage("DNS server %s\n", cfg.dns4);
661 fmessage("\n"); 663 fmessage("\n");
662 } 664 }
663 } 665 }
diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
index 274a4353f..fed1f7ba7 100644
--- a/src/firejail/sbox.c
+++ b/src/firejail/sbox.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c
index 9c32f2169..0184db65c 100644
--- a/src/firejail/seccomp.c
+++ b/src/firejail/seccomp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c
index f187960d5..12dfdf450 100644
--- a/src/firejail/shutdown.c
+++ b/src/firejail/shutdown.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 89ea4ccca..1106a4389 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/util.c b/src/firejail/util.c
index 6758a14e1..5a9f3a6e0 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 8604e8bc8..3903b4709 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/arp.c b/src/firemon/arp.c
index dad183b85..aac1aeba3 100644
--- a/src/firemon/arp.c
+++ b/src/firemon/arp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/caps.c b/src/firemon/caps.c
index 09955d983..0df338439 100644
--- a/src/firemon/caps.c
+++ b/src/firemon/caps.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/cgroup.c b/src/firemon/cgroup.c
index 6b39ee385..8dbf85824 100644
--- a/src/firemon/cgroup.c
+++ b/src/firemon/cgroup.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/cpu.c b/src/firemon/cpu.c
index 6a7310c34..e552959e8 100644
--- a/src/firemon/cpu.c
+++ b/src/firemon/cpu.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index 99ce179a8..44e2b8687 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/firemon.h b/src/firemon/firemon.h
index 9798ed545..a03aa85e5 100644
--- a/src/firemon/firemon.h
+++ b/src/firemon/firemon.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/interface.c b/src/firemon/interface.c
index 839cea624..71026c7b7 100644
--- a/src/firemon/interface.c
+++ b/src/firemon/interface.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/list.c b/src/firemon/list.c
index b8e54c233..846739af5 100644
--- a/src/firemon/list.c
+++ b/src/firemon/list.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/netstats.c b/src/firemon/netstats.c
index c68e2e51b..04c47d747 100644
--- a/src/firemon/netstats.c
+++ b/src/firemon/netstats.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c
index ecbcf35db..301e5397b 100644
--- a/src/firemon/procevent.c
+++ b/src/firemon/procevent.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/route.c b/src/firemon/route.c
index 76b268897..7426637df 100644
--- a/src/firemon/route.c
+++ b/src/firemon/route.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/seccomp.c b/src/firemon/seccomp.c
index ce9d1dffb..c361ec76d 100644
--- a/src/firemon/seccomp.c
+++ b/src/firemon/seccomp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/top.c b/src/firemon/top.c
index 6ea642109..d60a0baef 100644
--- a/src/firemon/top.c
+++ b/src/firemon/top.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/tree.c b/src/firemon/tree.c
index 846c6ed75..99a7f3d88 100644
--- a/src/firemon/tree.c
+++ b/src/firemon/tree.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/usage.c b/src/firemon/usage.c
index 58e3b63f3..9d3babf55 100644
--- a/src/firemon/usage.c
+++ b/src/firemon/usage.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/firemon/x11.c b/src/firemon/x11.c
index 57d7c1e82..09eb3cd06 100644
--- a/src/firemon/x11.c
+++ b/src/firemon/x11.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fldd/main.c b/src/fldd/main.c
index 4439c6509..a0530c235 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/floader/loader.c b/src/floader/loader.c
index 6b9f92f18..b9844fa9b 100644
--- a/src/floader/loader.c
+++ b/src/floader/loader.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2017 Madura A. (madura.x86@gmail.com) 2 * Copyright (C) 2017-2018 Madura A. (madura.x86@gmail.com)
3 * 3 *
4 */ 4 */
5#include <sys/types.h> 5#include <sys/types.h>
diff --git a/src/fnet/arp.c b/src/fnet/arp.c
index 00525229e..2b6df6945 100644
--- a/src/fnet/arp.c
+++ b/src/fnet/arp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fnet/fnet.h b/src/fnet/fnet.h
index 78d6eb1c6..71299852d 100644
--- a/src/fnet/fnet.h
+++ b/src/fnet/fnet.h
@@ -1,5 +1,5 @@
1 /* 1 /*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fnet/interface.c b/src/fnet/interface.c
index d05c0d50d..f3e9a8993 100644
--- a/src/fnet/interface.c
+++ b/src/fnet/interface.c
@@ -1,5 +1,5 @@
1 /* 1 /*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fnet/main.c b/src/fnet/main.c
index f746f9c7d..59ea5c345 100644
--- a/src/fnet/main.c
+++ b/src/fnet/main.c
@@ -1,5 +1,5 @@
1 /* 1 /*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fnet/veth.c b/src/fnet/veth.c
index d37c93a19..c971943a7 100644
--- a/src/fnet/veth.c
+++ b/src/fnet/veth.c
@@ -26,7 +26,7 @@
26 * 26 *
27 */ 27 */
28 /* 28 /*
29 * Copyright (C) 2014-2017 Firejail Authors 29 * Copyright (C) 2014-2018 Firejail Authors
30 * 30 *
31 * This file is part of firejail project 31 * This file is part of firejail project
32 * 32 *
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c
index d6ed502b8..828b30d40 100644
--- a/src/fnetfilter/main.c
+++ b/src/fnetfilter/main.c
@@ -1,5 +1,5 @@
1 /* 1 /*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fsec-optimize/fsec_optimize.h b/src/fsec-optimize/fsec_optimize.h
index ff4d53ab2..7a19b318b 100644
--- a/src/fsec-optimize/fsec_optimize.h
+++ b/src/fsec-optimize/fsec_optimize.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fsec-optimize/main.c b/src/fsec-optimize/main.c
index 2c11b91ef..f4300f350 100644
--- a/src/fsec-optimize/main.c
+++ b/src/fsec-optimize/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -78,7 +78,7 @@ printf("\n");
78 return 1; 78 return 1;
79 } 79 }
80 size = write(fd, outfilter, entries * sizeof(struct sock_filter)); 80 size = write(fd, outfilter, entries * sizeof(struct sock_filter));
81 if (size != entries * sizeof(struct sock_filter)) { 81 if (size != (int) (entries * sizeof(struct sock_filter))) {
82 fprintf(stderr, "Error: cannot write output file\n"); 82 fprintf(stderr, "Error: cannot write output file\n");
83 return 1; 83 return 1;
84 } 84 }
diff --git a/src/fsec-optimize/optimizer.c b/src/fsec-optimize/optimizer.c
index 8e61935d3..98e4aaa34 100644
--- a/src/fsec-optimize/optimizer.c
+++ b/src/fsec-optimize/optimizer.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -91,7 +91,7 @@ static int optimize_blacklists(struct sock_filter *filter, int entries) {
91 91
92 // step 3: add the new ret KILL, and recalculate entries 92 // step 3: add the new ret KILL, and recalculate entries
93 filter_step2[j].code = BPF_RET + BPF_K; 93 filter_step2[j].code = BPF_RET + BPF_K;
94 filter_step2[j].k == SECCOMP_RET_KILL; 94 filter_step2[j].k = SECCOMP_RET_KILL;
95 entries = j + 1; 95 entries = j + 1;
96 96
97 // step 4: recalculate jumps 97 // step 4: recalculate jumps
diff --git a/src/fsec-print/fsec_print.h b/src/fsec-print/fsec_print.h
index d3f4a4df9..10c7d8f3d 100644
--- a/src/fsec-print/fsec_print.h
+++ b/src/fsec-print/fsec_print.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c
index e8639b822..94c60687f 100644
--- a/src/fsec-print/main.c
+++ b/src/fsec-print/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fsec-print/print.c b/src/fsec-print/print.c
index 964a3a8a9..e3b53c44c 100644
--- a/src/fsec-print/print.c
+++ b/src/fsec-print/print.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -305,7 +305,6 @@ static void bpf_decode_args(const struct sock_filter *bpf, unsigned int line) {
305} 305}
306 306
307void print(struct sock_filter *filter, int entries) { 307void print(struct sock_filter *filter, int entries) {
308 unsigned int line = 0;
309 int i; 308 int i;
310 309
311 /* header */ 310 /* header */
diff --git a/src/fsec-print/syscall_list.c b/src/fsec-print/syscall_list.c
index 410956de5..8ea53e74e 100644
--- a/src/fsec-print/syscall_list.c
+++ b/src/fsec-print/syscall_list.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/errno.c b/src/fseccomp/errno.c
index e5cd4e226..78d219c9e 100644
--- a/src/fseccomp/errno.c
+++ b/src/fseccomp/errno.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/fseccomp.h b/src/fseccomp/fseccomp.h
index 2deb282f5..22b02cd16 100644
--- a/src/fseccomp/fseccomp.h
+++ b/src/fseccomp/fseccomp.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/main.c b/src/fseccomp/main.c
index 030eaf90b..ab6683065 100644
--- a/src/fseccomp/main.c
+++ b/src/fseccomp/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/protocol.c b/src/fseccomp/protocol.c
index 43bc3d562..18e81f633 100644
--- a/src/fseccomp/protocol.c
+++ b/src/fseccomp/protocol.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/seccomp.c b/src/fseccomp/seccomp.c
index 028cd76a9..777c38c43 100644
--- a/src/fseccomp/seccomp.c
+++ b/src/fseccomp/seccomp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/seccomp_file.c b/src/fseccomp/seccomp_file.c
index 2d5ee115d..fd89fc8d5 100644
--- a/src/fseccomp/seccomp_file.c
+++ b/src/fseccomp/seccomp_file.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/seccomp_secondary.c b/src/fseccomp/seccomp_secondary.c
index da6a693e6..ebda1b938 100644
--- a/src/fseccomp/seccomp_secondary.c
+++ b/src/fseccomp/seccomp_secondary.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/fseccomp/syscall.c b/src/fseccomp/syscall.c
index 69b6e5271..8a72f0681 100644
--- a/src/fseccomp/syscall.c
+++ b/src/fseccomp/syscall.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/ftee/ftee.h b/src/ftee/ftee.h
index 48f3b5fdf..68c4201c7 100644
--- a/src/ftee/ftee.h
+++ b/src/ftee/ftee.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/ftee/main.c b/src/ftee/main.c
index 2f6adb9c8..0e37f0b72 100644
--- a/src/ftee/main.c
+++ b/src/ftee/main.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/include/common.h b/src/include/common.h
index 80f55803d..413cf98a5 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/include/euid_common.h b/src/include/euid_common.h
index 4e6db514d..b31c3e760 100644
--- a/src/include/euid_common.h
+++ b/src/include/euid_common.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/include/pid.h b/src/include/pid.h
index ca152f972..55f2893a8 100644
--- a/src/include/pid.h
+++ b/src/include/pid.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/include/seccomp.h b/src/include/seccomp.h
index 6d8983b39..01b8e4a07 100644
--- a/src/include/seccomp.h
+++ b/src/include/seccomp.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/include/syscall.h b/src/include/syscall.h
index df9a03ffb..6d301158e 100644
--- a/src/include/syscall.h
+++ b/src/include/syscall.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
@@ -71,6 +71,11 @@
71 {"alarm", __NR_alarm}, 71 {"alarm", __NR_alarm},
72#endif 72#endif
73#endif 73#endif
74#ifdef SYS_arch_prctl
75#ifdef __NR_arch_prctl
76 {"arch_prctl", __NR_arch_prctl},
77#endif
78#endif
74#ifdef SYS_bdflush 79#ifdef SYS_bdflush
75#ifdef __NR_bdflush 80#ifdef __NR_bdflush
76 {"bdflush", __NR_bdflush}, 81 {"bdflush", __NR_bdflush},
@@ -1051,6 +1056,21 @@
1051 {"pivot_root", __NR_pivot_root}, 1056 {"pivot_root", __NR_pivot_root},
1052#endif 1057#endif
1053#endif 1058#endif
1059#ifdef SYS_pkey_alloc
1060#ifdef __NR_pkey_alloc
1061 {"pkey_alloc", __NR_pkey_alloc},
1062#endif
1063#endif
1064#ifdef SYS_pkey_free
1065#ifdef __NR_pkey_free
1066 {"pkey_free", __NR_pkey_free},
1067#endif
1068#endif
1069#ifdef SYS_pkey_mprotect
1070#ifdef __NR_pkey_mprotect
1071 {"pkey_mprotect", __NR_pkey_mprotect},
1072#endif
1073#endif
1054#ifdef SYS_poll 1074#ifdef SYS_poll
1055#ifdef __NR_poll 1075#ifdef __NR_poll
1056 {"poll", __NR_poll}, 1076 {"poll", __NR_poll},
@@ -1636,6 +1656,11 @@
1636 {"statfs64", __NR_statfs64}, 1656 {"statfs64", __NR_statfs64},
1637#endif 1657#endif
1638#endif 1658#endif
1659#ifdef SYS_statx
1660#ifdef __NR_statx
1661 {"statx", __NR_statx},
1662#endif
1663#endif
1639#ifdef SYS_stime 1664#ifdef SYS_stime
1640#ifdef __NR_stime 1665#ifdef __NR_stime
1641 {"stime", __NR_stime}, 1666 {"stime", __NR_stime},
@@ -2814,6 +2839,21 @@
2814 {"pivot_root", __NR_pivot_root}, 2839 {"pivot_root", __NR_pivot_root},
2815#endif 2840#endif
2816#endif 2841#endif
2842#ifdef SYS_pkey_alloc
2843#ifdef __NR_pkey_alloc
2844 {"pkey_alloc", __NR_pkey_alloc},
2845#endif
2846#endif
2847#ifdef SYS_pkey_free
2848#ifdef __NR_pkey_free
2849 {"pkey_free", __NR_pkey_free},
2850#endif
2851#endif
2852#ifdef SYS_pkey_mprotect
2853#ifdef __NR_pkey_mprotect
2854 {"pkey_mprotect", __NR_pkey_mprotect},
2855#endif
2856#endif
2817#ifdef SYS_poll 2857#ifdef SYS_poll
2818#ifdef __NR_poll 2858#ifdef __NR_poll
2819 {"poll", __NR_poll}, 2859 {"poll", __NR_poll},
@@ -3324,6 +3364,11 @@
3324 {"statfs", __NR_statfs}, 3364 {"statfs", __NR_statfs},
3325#endif 3365#endif
3326#endif 3366#endif
3367#ifdef SYS_statx
3368#ifdef __NR_statx
3369 {"statx", __NR_statx},
3370#endif
3371#endif
3327#ifdef SYS_swapoff 3372#ifdef SYS_swapoff
3328#ifdef __NR_swapoff 3373#ifdef __NR_swapoff
3329 {"swapoff", __NR_swapoff}, 3374 {"swapoff", __NR_swapoff},
@@ -4427,6 +4472,21 @@
4427 {"pivot_root", __NR_pivot_root}, 4472 {"pivot_root", __NR_pivot_root},
4428#endif 4473#endif
4429#endif 4474#endif
4475#ifdef SYS_pkey_alloc
4476#ifdef __NR_pkey_alloc
4477 {"pkey_alloc", __NR_pkey_alloc},
4478#endif
4479#endif
4480#ifdef SYS_pkey_free
4481#ifdef __NR_pkey_free
4482 {"pkey_free", __NR_pkey_free},
4483#endif
4484#endif
4485#ifdef SYS_pkey_mprotect
4486#ifdef __NR_pkey_mprotect
4487 {"pkey_mprotect", __NR_pkey_mprotect},
4488#endif
4489#endif
4430#ifdef SYS_poll 4490#ifdef SYS_poll
4431#ifdef __NR_poll 4491#ifdef __NR_poll
4432 {"poll", __NR_poll}, 4492 {"poll", __NR_poll},
@@ -4927,6 +4987,11 @@
4927 {"statfs", __NR_statfs}, 4987 {"statfs", __NR_statfs},
4928#endif 4988#endif
4929#endif 4989#endif
4990#ifdef SYS_statx
4991#ifdef __NR_statx
4992 {"statx", __NR_statx},
4993#endif
4994#endif
4930#ifdef SYS_swapoff 4995#ifdef SYS_swapoff
4931#ifdef __NR_swapoff 4996#ifdef __NR_swapoff
4932 {"swapoff", __NR_swapoff}, 4997 {"swapoff", __NR_swapoff},
diff --git a/src/lib/common.c b/src/lib/common.c
index 3d7fc5ffa..fa988446b 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/lib/pid.c b/src/lib/pid.c
index 5f19944b6..0b2f402d1 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/libpostexecseccomp/libpostexecseccomp.c b/src/libpostexecseccomp/libpostexecseccomp.c
index 2c9d02c84..0ccb74b10 100644
--- a/src/libpostexecseccomp/libpostexecseccomp.c
+++ b/src/libpostexecseccomp/libpostexecseccomp.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/libpostexecseccomp/libpostexecseccomp.h b/src/libpostexecseccomp/libpostexecseccomp.h
index c4aca540a..52d3128c9 100644
--- a/src/libpostexecseccomp/libpostexecseccomp.h
+++ b/src/libpostexecseccomp/libpostexecseccomp.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c
index 2b0a76938..01e8645c7 100644
--- a/src/libtrace/libtrace.c
+++ b/src/libtrace/libtrace.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c
index dc68b0620..5ce41aca0 100644
--- a/src/libtracelog/libtracelog.c
+++ b/src/libtracelog/libtracelog.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/tools/extract_caps.c b/src/tools/extract_caps.c
index 5e9c1764d..9769fb071 100644
--- a/src/tools/extract_caps.c
+++ b/src/tools/extract_caps.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/tools/extract_syscalls.c b/src/tools/extract_syscalls.c
index 18c1814e6..d7e16e912 100644
--- a/src/tools/extract_syscalls.c
+++ b/src/tools/extract_syscalls.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/src/tools/rvtest.c b/src/tools/rvtest.c
index f2f114ea7..b64505fe2 100644
--- a/src/tools/rvtest.c
+++ b/src/tools/rvtest.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp
index a2cc9285e..dcf16452f 100755
--- a/test/appimage/appimage-args.exp
+++ b/test/appimage/appimage-args.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp
index 86a968125..073c32dab 100755
--- a/test/appimage/appimage-v1.exp
+++ b/test/appimage/appimage-v1.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp
index f89ac008c..f840a3d2d 100755
--- a/test/appimage/appimage-v2.exp
+++ b/test/appimage/appimage-v2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/appimage/appimage.sh b/test/appimage/appimage.sh
index 4221944e2..8fff40949 100755
--- a/test/appimage/appimage.sh
+++ b/test/appimage/appimage.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/appimage/filename.exp b/test/appimage/filename.exp
index ebf2125f0..ac2f470f9 100755
--- a/test/appimage/filename.exp
+++ b/test/appimage/filename.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh
index 6f051b28d..32331f786 100755
--- a/test/apps-x11-xorg/apps-x11-xorg.sh
+++ b/test/apps-x11-xorg/apps-x11-xorg.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp
index a0e8284d3..10575b277 100755
--- a/test/apps-x11-xorg/firefox.exp
+++ b/test/apps-x11-xorg/firefox.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp
index 42220b52e..6706cc321 100755
--- a/test/apps-x11-xorg/thunderbird.exp
+++ b/test/apps-x11-xorg/thunderbird.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp
index aec4c46ad..75c302764 100755
--- a/test/apps-x11-xorg/transmission-gtk.exp
+++ b/test/apps-x11-xorg/transmission-gtk.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh
index 1e98b74fd..2e0031dd9 100755
--- a/test/apps-x11/apps-x11.sh
+++ b/test/apps-x11/apps-x11.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp
index a7eace125..f72b86dde 100755
--- a/test/apps-x11/chromium.exp
+++ b/test/apps-x11/chromium.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/firefox.exp b/test/apps-x11/firefox.exp
index c77d120a8..8021042e5 100755
--- a/test/apps-x11/firefox.exp
+++ b/test/apps-x11/firefox.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/thunderbird.exp b/test/apps-x11/thunderbird.exp
index 604a6a0d3..5994ab15e 100755
--- a/test/apps-x11/thunderbird.exp
+++ b/test/apps-x11/thunderbird.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/transmission-gtk.exp b/test/apps-x11/transmission-gtk.exp
index 8403b7a9f..48c685cf0 100755
--- a/test/apps-x11/transmission-gtk.exp
+++ b/test/apps-x11/transmission-gtk.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/x11-none.exp b/test/apps-x11/x11-none.exp
index e811533f9..e6e515966 100755
--- a/test/apps-x11/x11-none.exp
+++ b/test/apps-x11/x11-none.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/x11-xephyr.exp b/test/apps-x11/x11-xephyr.exp
index 3f032ae4a..68f981096 100755
--- a/test/apps-x11/x11-xephyr.exp
+++ b/test/apps-x11/x11-xephyr.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/xterm-xephyr.exp b/test/apps-x11/xterm-xephyr.exp
index b1ee9e5b4..63fa03fbb 100755
--- a/test/apps-x11/xterm-xephyr.exp
+++ b/test/apps-x11/xterm-xephyr.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/xterm-xorg.exp b/test/apps-x11/xterm-xorg.exp
index 76c6891ea..a31925383 100755
--- a/test/apps-x11/xterm-xorg.exp
+++ b/test/apps-x11/xterm-xorg.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp
index 6425412c9..8830bb003 100755
--- a/test/apps-x11/xterm-xpra.exp
+++ b/test/apps-x11/xterm-xpra.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/apps.sh b/test/apps/apps.sh
index 04b6f0c85..4e0a9cc08 100755
--- a/test/apps/apps.sh
+++ b/test/apps/apps.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp
index 6b784e395..9373bb70e 100755
--- a/test/apps/chromium.exp
+++ b/test/apps/chromium.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/deluge.exp b/test/apps/deluge.exp
index 004b8d144..63811aecc 100755
--- a/test/apps/deluge.exp
+++ b/test/apps/deluge.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/fbreader.exp b/test/apps/fbreader.exp
index d0ad8be0a..64c569225 100755
--- a/test/apps/fbreader.exp
+++ b/test/apps/fbreader.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/filezilla.exp b/test/apps/filezilla.exp
index da8c23773..e04d6ed2b 100755
--- a/test/apps/filezilla.exp
+++ b/test/apps/filezilla.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/firefox.exp b/test/apps/firefox.exp
index 84504ccbf..a646ecbde 100755
--- a/test/apps/firefox.exp
+++ b/test/apps/firefox.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp
index d0c370df0..3c360a32c 100755
--- a/test/apps/gnome-mplayer.exp
+++ b/test/apps/gnome-mplayer.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/gthumb.exp b/test/apps/gthumb.exp
index 9edcd68fe..e13ca6179 100755
--- a/test/apps/gthumb.exp
+++ b/test/apps/gthumb.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/hexchat.exp b/test/apps/hexchat.exp
index 35e12ea87..d83ac6655 100755
--- a/test/apps/hexchat.exp
+++ b/test/apps/hexchat.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/kcalc.exp b/test/apps/kcalc.exp
index 8158625b4..247444b05 100755
--- a/test/apps/kcalc.exp
+++ b/test/apps/kcalc.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/ktorrent.exp b/test/apps/ktorrent.exp
index cbad352ca..fb7fab5e4 100755
--- a/test/apps/ktorrent.exp
+++ b/test/apps/ktorrent.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/midori.exp b/test/apps/midori.exp
index be6df1cbd..cefdbc0d9 100755
--- a/test/apps/midori.exp
+++ b/test/apps/midori.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/opera.exp b/test/apps/opera.exp
index eb6aef719..21a560ac3 100755
--- a/test/apps/opera.exp
+++ b/test/apps/opera.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/qbittorrent.exp b/test/apps/qbittorrent.exp
index 742d9baf1..7e93fdc1d 100755
--- a/test/apps/qbittorrent.exp
+++ b/test/apps/qbittorrent.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/thunderbird.exp b/test/apps/thunderbird.exp
index f1aad2871..2440d612f 100755
--- a/test/apps/thunderbird.exp
+++ b/test/apps/thunderbird.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/transmission-qt.exp b/test/apps/transmission-qt.exp
index 63f135b1d..c74ea2aac 100755
--- a/test/apps/transmission-qt.exp
+++ b/test/apps/transmission-qt.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/uget-gtk.exp b/test/apps/uget-gtk.exp
index 05dd9edc6..eabe150ee 100755
--- a/test/apps/uget-gtk.exp
+++ b/test/apps/uget-gtk.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/vlc.exp b/test/apps/vlc.exp
index 9d75c40d6..364b5c567 100755
--- a/test/apps/vlc.exp
+++ b/test/apps/vlc.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/wine.exp b/test/apps/wine.exp
index 75f044ca6..261232738 100755
--- a/test/apps/wine.exp
+++ b/test/apps/wine.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/apps/xchat.exp b/test/apps/xchat.exp
index 427e09159..587c837e6 100755
--- a/test/apps/xchat.exp
+++ b/test/apps/xchat.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/chroot/chroot.sh b/test/chroot/chroot.sh
index e7911caa0..0f0fdab22 100755
--- a/test/chroot/chroot.sh
+++ b/test/chroot/chroot.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/environment/csh.exp b/test/environment/csh.exp
index 633934791..7b9fe7dc4 100755
--- a/test/environment/csh.exp
+++ b/test/environment/csh.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/environment/dns.exp b/test/environment/dns.exp
index 0d12a82f2..6ddc0ccea 100755
--- a/test/environment/dns.exp
+++ b/test/environment/dns.exp
@@ -4,7 +4,7 @@ set timeout 30
4spawn $env(SHELL) 4spawn $env(SHELL)
5match_max 100000 5match_max 100000
6 6
7send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1\r" 7send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1 --dns=::2\r"
8expect { 8expect {
9 timeout {puts "TESTING ERROR 2.1\n";exit} 9 timeout {puts "TESTING ERROR 2.1\n";exit}
10 "Child process initialized" 10 "Child process initialized"
@@ -24,6 +24,10 @@ expect {
24 timeout {puts "TESTING ERROR 2.4\n";exit} 24 timeout {puts "TESTING ERROR 2.4\n";exit}
25 "nameserver 4.2.2.1" 25 "nameserver 4.2.2.1"
26} 26}
27expect {
28 timeout {puts "TESTING ERROR 2.5\n";exit}
29 "nameserver ::2"
30}
27after 100 31after 100
28send -- "exit\r" 32send -- "exit\r"
29sleep 1 33sleep 1
@@ -50,6 +54,10 @@ expect {
50 "nameserver 4.2.2.1" 54 "nameserver 4.2.2.1"
51} 55}
52after 100 56after 100
57expect {
58 timeout {puts "TESTING ERROR 12.5\n";exit}
59 "nameserver ::2"
60}
53send -- "exit\r" 61send -- "exit\r"
54sleep 1 62sleep 1
55 63
diff --git a/test/environment/dns.profile b/test/environment/dns.profile
index d1b842c86..ade2f2650 100644
--- a/test/environment/dns.profile
+++ b/test/environment/dns.profile
@@ -1,3 +1,4 @@
1dns 8.8.4.4 1dns 8.8.4.4
2dns 8.8.8.8 2dns 8.8.8.8
3dns 4.2.2.1 3dns 4.2.2.1
4dns ::2
diff --git a/test/environment/env.exp b/test/environment/env.exp
index 9e2ba1e1c..4557cd9b2 100755
--- a/test/environment/env.exp
+++ b/test/environment/env.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 844e90cb8..b6688d484 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp
index c2e2be596..6f8f4316f 100755
--- a/test/environment/firejail-in-firejail.exp
+++ b/test/environment/firejail-in-firejail.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/environment/firejail-in-firejail2.exp b/test/environment/firejail-in-firejail2.exp
index db64d59ed..6528e45cd 100755
--- a/test/environment/firejail-in-firejail2.exp
+++ b/test/environment/firejail-in-firejail2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/environment/hostfile.exp b/test/environment/hostfile.exp
index c42864432..fd85a25ea 100755
--- a/test/environment/hostfile.exp
+++ b/test/environment/hostfile.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6 6
diff --git a/test/environment/machineid.exp b/test/environment/machineid.exp
index 02eb6b232..0c6b1c936 100755
--- a/test/environment/machineid.exp
+++ b/test/environment/machineid.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6 6
diff --git a/test/environment/nice.exp b/test/environment/nice.exp
index f0ca93a5e..b989ea37a 100755
--- a/test/environment/nice.exp
+++ b/test/environment/nice.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/environment/quiet.exp b/test/environment/quiet.exp
index 0df798f01..206c2ac8f 100755
--- a/test/environment/quiet.exp
+++ b/test/environment/quiet.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 4 6set timeout 4
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp
index 6514e6840..e8195d1fb 100755
--- a/test/environment/shell-none.exp
+++ b/test/environment/shell-none.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/environment/sound.exp b/test/environment/sound.exp
index 18691b1f9..29d431c5e 100755
--- a/test/environment/sound.exp
+++ b/test/environment/sound.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6 6
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp
index ac29c57ba..d69cef071 100755
--- a/test/environment/timeout.exp
+++ b/test/environment/timeout.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp
index 711905f2c..65fe440c7 100755
--- a/test/environment/zsh.exp
+++ b/test/environment/zsh.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fcopy/cmdline.exp b/test/fcopy/cmdline.exp
index 798c9e718..b68a09f99 100755
--- a/test/fcopy/cmdline.exp
+++ b/test/fcopy/cmdline.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fcopy/dircopy.exp b/test/fcopy/dircopy.exp
index ae6ffecf0..bb5a1e45e 100755
--- a/test/fcopy/dircopy.exp
+++ b/test/fcopy/dircopy.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6# 6#
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh
index 19401cf98..0e7cb2e5e 100755
--- a/test/fcopy/fcopy.sh
+++ b/test/fcopy/fcopy.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/fcopy/filecopy.exp b/test/fcopy/filecopy.exp
index 8074f2ee8..e5d6fb0bc 100755
--- a/test/fcopy/filecopy.exp
+++ b/test/fcopy/filecopy.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6# 6#
diff --git a/test/fcopy/linkcopy.exp b/test/fcopy/linkcopy.exp
index ea64329c1..ab3369bbc 100755
--- a/test/fcopy/linkcopy.exp
+++ b/test/fcopy/linkcopy.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6# 6#
diff --git a/test/fcopy/trailing.exp b/test/fcopy/trailing.exp
index 1bff4e6c8..bd51a2b7b 100755
--- a/test/fcopy/trailing.exp
+++ b/test/fcopy/trailing.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6# 6#
diff --git a/test/filters/caps-print.exp b/test/filters/caps-print.exp
index 605041e22..ce85a7732 100755
--- a/test/filters/caps-print.exp
+++ b/test/filters/caps-print.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/caps.exp b/test/filters/caps.exp
index aff5f03c2..5a89dbf1b 100755
--- a/test/filters/caps.exp
+++ b/test/filters/caps.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/debug.exp b/test/filters/debug.exp
index d37353378..5c9005b45 100755
--- a/test/filters/debug.exp
+++ b/test/filters/debug.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index d59d9109b..45b1d0459 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/filters/fseccomp.exp b/test/filters/fseccomp.exp
index 15959ff26..93f24ba71 100755
--- a/test/filters/fseccomp.exp
+++ b/test/filters/fseccomp.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/memwrexe-32.exp b/test/filters/memwrexe-32.exp
index af2159973..fb06e6e1c 100755
--- a/test/filters/memwrexe-32.exp
+++ b/test/filters/memwrexe-32.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/memwrexe.exp b/test/filters/memwrexe.exp
index 6a57b8a07..abc16660c 100755
--- a/test/filters/memwrexe.exp
+++ b/test/filters/memwrexe.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp
index 838beca62..ba52a903a 100755
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp
index 71f54b08a..81c2a76de 100755
--- a/test/filters/protocol.exp
+++ b/test/filters/protocol.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-bad-empty.exp b/test/filters/seccomp-bad-empty.exp
index 19e64ee84..7dc3854e9 100755
--- a/test/filters/seccomp-bad-empty.exp
+++ b/test/filters/seccomp-bad-empty.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp
index fb4d0665b..6c8e4406c 100755
--- a/test/filters/seccomp-chmod-profile.exp
+++ b/test/filters/seccomp-chmod-profile.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp
index 1dd9633c2..788869cec 100755
--- a/test/filters/seccomp-chmod.exp
+++ b/test/filters/seccomp-chmod.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-chown.exp b/test/filters/seccomp-chown.exp
index 7d9da5e5a..59bc6792f 100755
--- a/test/filters/seccomp-chown.exp
+++ b/test/filters/seccomp-chown.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp
index 57087a0b3..67cfb9729 100755
--- a/test/filters/seccomp-debug-32.exp
+++ b/test/filters/seccomp-debug-32.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp
index ee72e34ae..cceeb7041 100755
--- a/test/filters/seccomp-debug.exp
+++ b/test/filters/seccomp-debug.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp
index abf093201..5a20bb243 100755
--- a/test/filters/seccomp-dualfilter.exp
+++ b/test/filters/seccomp-dualfilter.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 1 6set timeout 1
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp
index 77e8a2651..e610b3172 100755
--- a/test/filters/seccomp-empty.exp
+++ b/test/filters/seccomp-empty.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-errno.exp b/test/filters/seccomp-errno.exp
index 458fccc4e..b59eadc59 100755
--- a/test/filters/seccomp-errno.exp
+++ b/test/filters/seccomp-errno.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-ptrace.exp b/test/filters/seccomp-ptrace.exp
index 2c6d9d25e..272523778 100755
--- a/test/filters/seccomp-ptrace.exp
+++ b/test/filters/seccomp-ptrace.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/seccomp-su.exp b/test/filters/seccomp-su.exp
index 62135abb8..df1e339d2 100755
--- a/test/filters/seccomp-su.exp
+++ b/test/filters/seccomp-su.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/filters/syscall_test.c b/test/filters/syscall_test.c
index 641eb0c00..09e9614b3 100644
--- a/test/filters/syscall_test.c
+++ b/test/filters/syscall_test.c
@@ -1,5 +1,5 @@
1// This file is part of Firejail project 1// This file is part of Firejail project
2// Copyright (C) 2014-2017 Firejail Authors 2// Copyright (C) 2014-2018 Firejail Authors
3// License GPL v2 3// License GPL v2
4 4
5#include <stdlib.h> 5#include <stdlib.h>
diff --git a/test/fnetfilter/cmdline.exp b/test/fnetfilter/cmdline.exp
index 1a0b1c5aa..71b448611 100755
--- a/test/fnetfilter/cmdline.exp
+++ b/test/fnetfilter/cmdline.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fnetfilter/copy.exp b/test/fnetfilter/copy.exp
index f619d503a..bf95338c4 100755
--- a/test/fnetfilter/copy.exp
+++ b/test/fnetfilter/copy.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fnetfilter/default.exp b/test/fnetfilter/default.exp
index d7c9d91d5..4c24b370f 100755
--- a/test/fnetfilter/default.exp
+++ b/test/fnetfilter/default.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fnetfilter/fnetfilter.sh b/test/fnetfilter/fnetfilter.sh
index d69fc447c..bae952ee9 100755
--- a/test/fnetfilter/fnetfilter.sh
+++ b/test/fnetfilter/fnetfilter.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/fnetfilter/template.exp b/test/fnetfilter/template.exp
index eb57313bd..b63a2d4c9 100755
--- a/test/fnetfilter/template.exp
+++ b/test/fnetfilter/template.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index e67ccc476..dea037a4b 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/fs/fs_dev_shm.exp b/test/fs/fs_dev_shm.exp
index 405d32396..41dd9d7fd 100755
--- a/test/fs/fs_dev_shm.exp
+++ b/test/fs/fs_dev_shm.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/fs_var_lock.exp b/test/fs/fs_var_lock.exp
index 63893b855..72f3c8710 100755
--- a/test/fs/fs_var_lock.exp
+++ b/test/fs/fs_var_lock.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/fs_var_tmp.exp b/test/fs/fs_var_tmp.exp
index d95bf3337..146a31ddb 100755
--- a/test/fs/fs_var_tmp.exp
+++ b/test/fs/fs_var_tmp.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/invalid_filename.exp b/test/fs/invalid_filename.exp
index 3d734e852..e16798ab8 100755
--- a/test/fs/invalid_filename.exp
+++ b/test/fs/invalid_filename.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/kmsg.exp b/test/fs/kmsg.exp
index 8dd13b129..e12c71851 100755
--- a/test/fs/kmsg.exp
+++ b/test/fs/kmsg.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp
index 1faa913e0..33c5e9f76 100755
--- a/test/fs/mkdir_mkfile.exp
+++ b/test/fs/mkdir_mkfile.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/option_blacklist.exp b/test/fs/option_blacklist.exp
index 317651566..93ad17df0 100755
--- a/test/fs/option_blacklist.exp
+++ b/test/fs/option_blacklist.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp
index 3de1f736d..4db0a26c8 100755
--- a/test/fs/option_blacklist_glob.exp
+++ b/test/fs/option_blacklist_glob.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp
index 8a3114a11..7eca6e106 100755
--- a/test/fs/private-bin.exp
+++ b/test/fs/private-bin.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private-etc-empty.exp b/test/fs/private-etc-empty.exp
index b91da07f3..8506b664c 100755
--- a/test/fs/private-etc-empty.exp
+++ b/test/fs/private-etc-empty.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private-etc.exp b/test/fs/private-etc.exp
index a2223b593..5edaacd25 100755
--- a/test/fs/private-etc.exp
+++ b/test/fs/private-etc.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private-home-dir.exp b/test/fs/private-home-dir.exp
index d58adf801..320fb73fa 100755
--- a/test/fs/private-home-dir.exp
+++ b/test/fs/private-home-dir.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp
index 11fd52563..4d35e31e9 100755
--- a/test/fs/private-home.exp
+++ b/test/fs/private-home.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private-homedir.exp b/test/fs/private-homedir.exp
index 78dfdc1c4..10a73e219 100755
--- a/test/fs/private-homedir.exp
+++ b/test/fs/private-homedir.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private-lib.exp b/test/fs/private-lib.exp
index 422d8ef21..79e0341a3 100755
--- a/test/fs/private-lib.exp
+++ b/test/fs/private-lib.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6 6
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp
index bbb1a757c..4b4f9fdaa 100755
--- a/test/fs/private-whitelist.exp
+++ b/test/fs/private-whitelist.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/private.exp b/test/fs/private.exp
index e522ca5a1..154eb6777 100755
--- a/test/fs/private.exp
+++ b/test/fs/private.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/read-write.exp b/test/fs/read-write.exp
index c648f83dd..41d5a3f86 100755
--- a/test/fs/read-write.exp
+++ b/test/fs/read-write.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/sys_fs.exp b/test/fs/sys_fs.exp
index 23ae410be..4d04ec63f 100755
--- a/test/fs/sys_fs.exp
+++ b/test/fs/sys_fs.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp
index b6ae6319f..e404fbec7 100755
--- a/test/fs/whitelist-dev.exp
+++ b/test/fs/whitelist-dev.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp
index ac6adc165..a236e209e 100755
--- a/test/fs/whitelist-double.exp
+++ b/test/fs/whitelist-double.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/whitelist-downloads.exp b/test/fs/whitelist-downloads.exp
index ab411ca08..b82ca8eea 100755
--- a/test/fs/whitelist-downloads.exp
+++ b/test/fs/whitelist-downloads.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp
index 9e4406263..74a35742b 100755
--- a/test/fs/whitelist-empty.exp
+++ b/test/fs/whitelist-empty.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 30 6set timeout 30
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp
index 2988209d3..556c46f7c 100755
--- a/test/fs/whitelist.exp
+++ b/test/fs/whitelist.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp
index 88b06ee3d..f20cb1446 100755
--- a/test/network/4bridges_arp.exp
+++ b/test/network/4bridges_arp.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp
index e7308c106..6c83e038d 100755
--- a/test/network/4bridges_ip.exp
+++ b/test/network/4bridges_ip.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp
index db9772789..ff293a569 100755
--- a/test/network/bandwidth.exp
+++ b/test/network/bandwidth.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp
index f70d64dce..fea390b20 100755
--- a/test/network/firemon-interfaces.exp
+++ b/test/network/firemon-interfaces.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/hostname.exp b/test/network/hostname.exp
index 5dd14e028..9f4729771 100755
--- a/test/network/hostname.exp
+++ b/test/network/hostname.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/ip6.exp b/test/network/ip6.exp
index c55f690db..b1dfc0246 100755
--- a/test/network/ip6.exp
+++ b/test/network/ip6.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/iprange.exp b/test/network/iprange.exp
index c8a96b560..232cb9bbc 100755
--- a/test/network/iprange.exp
+++ b/test/network/iprange.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_arp.exp b/test/network/net_arp.exp
index 98ed8d9f1..d681e26c8 100755
--- a/test/network/net_arp.exp
+++ b/test/network/net_arp.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp
index 54f1858ca..5473b71fe 100755
--- a/test/network/net_badip.exp
+++ b/test/network/net_badip.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp
index 1eee2c252..8103e7d62 100755
--- a/test/network/net_defaultgw.exp
+++ b/test/network/net_defaultgw.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp
index 58f8f9edd..fbc4fd10c 100755
--- a/test/network/net_defaultgw2.exp
+++ b/test/network/net_defaultgw2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp
index 7762e98d6..5b946c90e 100755
--- a/test/network/net_defaultgw3.exp
+++ b/test/network/net_defaultgw3.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp
index a8cf08a86..44b082d35 100755
--- a/test/network/net_ip.exp
+++ b/test/network/net_ip.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_local.exp b/test/network/net_local.exp
index b724ce5d4..6f598b737 100755
--- a/test/network/net_local.exp
+++ b/test/network/net_local.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp
index d2aa19503..0ddfd3c8f 100755
--- a/test/network/net_mac.exp
+++ b/test/network/net_mac.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp
index 334eb448e..f29e33b80 100755
--- a/test/network/net_macvlan2.exp
+++ b/test/network/net_macvlan2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp
index 9436f5cc5..ac5fded4b 100755
--- a/test/network/net_mtu.exp
+++ b/test/network/net_mtu.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp
index 8f371bafc..76ea57ca5 100755
--- a/test/network/net_netfilter.exp
+++ b/test/network/net_netfilter.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp
index 1bde8456e..958586ccb 100755
--- a/test/network/net_noip.exp
+++ b/test/network/net_noip.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp
index 1e41c1b1c..8a6748114 100755
--- a/test/network/net_noip2.exp
+++ b/test/network/net_noip2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_none.exp b/test/network/net_none.exp
index b489d43f3..9ae5bbf29 100755
--- a/test/network/net_none.exp
+++ b/test/network/net_none.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp
index 801fc4dfa..19535ddf6 100755
--- a/test/network/net_profile.exp
+++ b/test/network/net_profile.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp
index 84893cf9c..f0d50bff2 100755
--- a/test/network/net_scan.exp
+++ b/test/network/net_scan.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp
index 62e41fcfc..85ef671e1 100755
--- a/test/network/net_veth.exp
+++ b/test/network/net_veth.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/netfilter-template.exp b/test/network/netfilter-template.exp
index 637b32468..1ad28a103 100755
--- a/test/network/netfilter-template.exp
+++ b/test/network/netfilter-template.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/netns.exp b/test/network/netns.exp
index 9475cf958..6b366d4f4 100755
--- a/test/network/netns.exp
+++ b/test/network/netns.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/netstats.exp b/test/network/netstats.exp
index e9ca4e027..1b72a57a3 100755
--- a/test/network/netstats.exp
+++ b/test/network/netstats.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/network/network.sh b/test/network/network.sh
index 83a70f1e3..4f001b49c 100755
--- a/test/network/network.sh
+++ b/test/network/network.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/network/tcpserver.c b/test/network/tcpserver.c
index b2395a4ad..2be871390 100644
--- a/test/network/tcpserver.c
+++ b/test/network/tcpserver.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2014-2017 Firejail Authors 2 * Copyright (C) 2014-2018 Firejail Authors
3 * 3 *
4 * This file is part of firejail project 4 * This file is part of firejail project
5 * 5 *
diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp
index a9aeac9ae..db2737199 100755
--- a/test/network/veth-name.exp
+++ b/test/network/veth-name.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/overlay/firefox-x11-xorg.exp b/test/overlay/firefox-x11-xorg.exp
index efbe0e4d7..ec24b23af 100755
--- a/test/overlay/firefox-x11-xorg.exp
+++ b/test/overlay/firefox-x11-xorg.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/overlay/firefox-x11.exp b/test/overlay/firefox-x11.exp
index f8b0740af..1b7034af0 100755
--- a/test/overlay/firefox-x11.exp
+++ b/test/overlay/firefox-x11.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/overlay/firefox.exp b/test/overlay/firefox.exp
index 1e719f86d..5bdd6751f 100755
--- a/test/overlay/firefox.exp
+++ b/test/overlay/firefox.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh
index 94ad6a3cd..6b7f779d7 100755
--- a/test/overlay/overlay.sh
+++ b/test/overlay/overlay.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/private-lib/atril.exp b/test/private-lib/atril.exp
index 0ddf41c50..04b11a646 100755
--- a/test/private-lib/atril.exp
+++ b/test/private-lib/atril.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/eog.exp b/test/private-lib/eog.exp
index 23af4e793..1b5406add 100755
--- a/test/private-lib/eog.exp
+++ b/test/private-lib/eog.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/eom.exp b/test/private-lib/eom.exp
index aaedf8c86..a8b74de98 100755
--- a/test/private-lib/eom.exp
+++ b/test/private-lib/eom.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/evince.exp b/test/private-lib/evince.exp
index 5eada5fdf..94ed826db 100755
--- a/test/private-lib/evince.exp
+++ b/test/private-lib/evince.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/galculator.exp b/test/private-lib/galculator.exp
index e8b079c0b..c18c07571 100755
--- a/test/private-lib/galculator.exp
+++ b/test/private-lib/galculator.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/gnome-calculator.exp b/test/private-lib/gnome-calculator.exp
index 6d20c36f4..e9d2c8208 100755
--- a/test/private-lib/gnome-calculator.exp
+++ b/test/private-lib/gnome-calculator.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/gpicview.exp b/test/private-lib/gpicview.exp
index ed566a892..8d36a9d11 100755
--- a/test/private-lib/gpicview.exp
+++ b/test/private-lib/gpicview.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/leafpad.exp b/test/private-lib/leafpad.exp
index 6d912bdd0..2a1b07f94 100755
--- a/test/private-lib/leafpad.exp
+++ b/test/private-lib/leafpad.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/mousepad.exp b/test/private-lib/mousepad.exp
index 8cd0ee6d6..2e8f5e92b 100755
--- a/test/private-lib/mousepad.exp
+++ b/test/private-lib/mousepad.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh
index 6e0881273..312fe502a 100755
--- a/test/private-lib/private-lib.sh
+++ b/test/private-lib/private-lib.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/private-lib/transmission-gtk.exp b/test/private-lib/transmission-gtk.exp
index 0d47eb9ac..06559293b 100755
--- a/test/private-lib/transmission-gtk.exp
+++ b/test/private-lib/transmission-gtk.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/private-lib/xcalc.exp b/test/private-lib/xcalc.exp
index 118b6f456..12bd73b51 100755
--- a/test/private-lib/xcalc.exp
+++ b/test/private-lib/xcalc.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp
index 8463d6cc8..e0c6e81c1 100755
--- a/test/profiles/ignore.exp
+++ b/test/profiles/ignore.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp
index 74b0d5a53..f74626959 100755
--- a/test/profiles/profile_syntax.exp
+++ b/test/profiles/profile_syntax.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/profiles/profile_syntax2.exp b/test/profiles/profile_syntax2.exp
index 07d486637..4d621f3ec 100755
--- a/test/profiles/profile_syntax2.exp
+++ b/test/profiles/profile_syntax2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index 3be10bedd..7c3549aea 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/profiles/test-profile.exp b/test/profiles/test-profile.exp
index 1eb487fe3..02aec5181 100755
--- a/test/profiles/test-profile.exp
+++ b/test/profiles/test-profile.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/cgroup.exp b/test/root/cgroup.exp
index 4b07183a1..b392cfabb 100755
--- a/test/root/cgroup.exp
+++ b/test/root/cgroup.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/checkcfg.exp b/test/root/checkcfg.exp
index 9b7402b95..1f6d17a9c 100755
--- a/test/root/checkcfg.exp
+++ b/test/root/checkcfg.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/firecfg.exp b/test/root/firecfg.exp
index 66c956a85..02f2323a0 100755
--- a/test/root/firecfg.exp
+++ b/test/root/firecfg.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/join.exp b/test/root/join.exp
index c70fff93d..2387ff560 100755
--- a/test/root/join.exp
+++ b/test/root/join.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/private.exp b/test/root/private.exp
index 479d7afb1..784761fc8 100755
--- a/test/root/private.exp
+++ b/test/root/private.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp
index dfec5a90e..59baeb4b1 100755
--- a/test/root/seccomp-chmod.exp
+++ b/test/root/seccomp-chmod.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp
index 85846ad96..a574776e3 100755
--- a/test/root/seccomp-chown.exp
+++ b/test/root/seccomp-chown.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/seccomp-umount.exp b/test/root/seccomp-umount.exp
index 90e240e74..d959a1a9b 100755
--- a/test/root/seccomp-umount.exp
+++ b/test/root/seccomp-umount.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/root/whitelist.exp b/test/root/whitelist.exp
index 1ba711c63..8712aff43 100755
--- a/test/root/whitelist.exp
+++ b/test/root/whitelist.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/stress/blacklist.exp b/test/stress/blacklist.exp
index abf6c985f..57155d77d 100755
--- a/test/stress/blacklist.exp
+++ b/test/stress/blacklist.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/stress/env.exp b/test/stress/env.exp
index b327ba498..bdba1e755 100755
--- a/test/stress/env.exp
+++ b/test/stress/env.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/stress/net_macvlan.exp b/test/stress/net_macvlan.exp
index 33a95b885..df5b9d582 100755
--- a/test/stress/net_macvlan.exp
+++ b/test/stress/net_macvlan.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/stress/stress.sh b/test/stress/stress.sh
index 57a8cae56..9b6f9808c 100755
--- a/test/stress/stress.sh
+++ b/test/stress/stress.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/sysutils/cpio.exp b/test/sysutils/cpio.exp
index e7e69df45..3b109257b 100755
--- a/test/sysutils/cpio.exp
+++ b/test/sysutils/cpio.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/file.exp b/test/sysutils/file.exp
index c220ab82e..f71e6b0f4 100755
--- a/test/sysutils/file.exp
+++ b/test/sysutils/file.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/gzip.exp b/test/sysutils/gzip.exp
index b56c27ceb..83804f348 100755
--- a/test/sysutils/gzip.exp
+++ b/test/sysutils/gzip.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp
index 29781c21a..7fa4b4df2 100755
--- a/test/sysutils/less.exp
+++ b/test/sysutils/less.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/ping.exp b/test/sysutils/ping.exp
index a47f4d0e4..d10cd2b66 100755
--- a/test/sysutils/ping.exp
+++ b/test/sysutils/ping.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/strings.exp b/test/sysutils/strings.exp
index 0d18b8079..f86d73fcc 100755
--- a/test/sysutils/strings.exp
+++ b/test/sysutils/strings.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index 8ec115d95..dd09e4533 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/sysutils/tar.exp b/test/sysutils/tar.exp
index 989f9ada2..57cf1a7d8 100755
--- a/test/sysutils/tar.exp
+++ b/test/sysutils/tar.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp
index 13ae6007b..5ccfccf88 100755
--- a/test/sysutils/xz.exp
+++ b/test/sysutils/xz.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/sysutils/xzdec.exp b/test/sysutils/xzdec.exp
index 0f3b3ba08..7f8b7fc0e 100755
--- a/test/sysutils/xzdec.exp
+++ b/test/sysutils/xzdec.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/test.sh b/test/test.sh
index 2693cb702..756c25650 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6./chk_config.exp 6./chk_config.exp
diff --git a/test/utils/audit.exp b/test/utils/audit.exp
index f0c1906a0..c68ee387c 100755
--- a/test/utils/audit.exp
+++ b/test/utils/audit.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/caps-print.exp b/test/utils/caps-print.exp
index d9d48bd50..0266a6f77 100755
--- a/test/utils/caps-print.exp
+++ b/test/utils/caps-print.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/cpu-print.exp b/test/utils/cpu-print.exp
index 714745106..f83f9acb3 100755
--- a/test/utils/cpu-print.exp
+++ b/test/utils/cpu-print.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/dns-print.exp b/test/utils/dns-print.exp
index 461231735..a0fbaa12f 100755
--- a/test/utils/dns-print.exp
+++ b/test/utils/dns-print.exp
@@ -1,13 +1,13 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
10send -- "firejail --name=test --dns=1.2.3.4\r" 10send -- "firejail --name=test --dns=1.2.3.4 --dns=::2\r"
11expect { 11expect {
12 timeout {puts "TESTING ERROR 0\n";exit} 12 timeout {puts "TESTING ERROR 0\n";exit}
13 "Child process initialized" 13 "Child process initialized"
@@ -20,5 +20,9 @@ expect {
20 timeout {puts "TESTING ERROR 1\n";exit} 20 timeout {puts "TESTING ERROR 1\n";exit}
21 "nameserver 1.2.3.4" 21 "nameserver 1.2.3.4"
22} 22}
23expect {
24 timeout {puts "TESTING ERROR 1\n";exit}
25 "nameserver ::2"
26}
23after 100 27after 100
24puts "\nall done\n" 28puts "\nall done\n"
diff --git a/test/utils/firemon-caps.exp b/test/utils/firemon-caps.exp
index 67bf853fe..5fd569970 100755
--- a/test/utils/firemon-caps.exp
+++ b/test/utils/firemon-caps.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp
index 43dfc4107..8282e701a 100755
--- a/test/utils/firemon-cgroup.exp
+++ b/test/utils/firemon-cgroup.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp
index adc6b3d45..b72c1c1e0 100755
--- a/test/utils/firemon-cpu.exp
+++ b/test/utils/firemon-cpu.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/firemon-interface.exp b/test/utils/firemon-interface.exp
index 4c976b42f..f96af2491 100755
--- a/test/utils/firemon-interface.exp
+++ b/test/utils/firemon-interface.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/firemon-name.exp b/test/utils/firemon-name.exp
index 37bfdd3b0..e9d1bf3b5 100755
--- a/test/utils/firemon-name.exp
+++ b/test/utils/firemon-name.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/firemon-seccomp.exp b/test/utils/firemon-seccomp.exp
index 56727a0be..f390c96d9 100755
--- a/test/utils/firemon-seccomp.exp
+++ b/test/utils/firemon-seccomp.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/firemon-version.exp b/test/utils/firemon-version.exp
index 94f72e454..f38cdc46d 100755
--- a/test/utils/firemon-version.exp
+++ b/test/utils/firemon-version.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp
index 11b4c9b7e..450945b66 100755
--- a/test/utils/fs-print.exp
+++ b/test/utils/fs-print.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/help.exp b/test/utils/help.exp
index 435f8e061..f19054303 100755
--- a/test/utils/help.exp
+++ b/test/utils/help.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/join.exp b/test/utils/join.exp
index d5c421676..4e65de615 100755
--- a/test/utils/join.exp
+++ b/test/utils/join.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/join2.exp b/test/utils/join2.exp
index 0c1fa6684..7a1ef6ce6 100755
--- a/test/utils/join2.exp
+++ b/test/utils/join2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/join3.exp b/test/utils/join3.exp
index 968aa3008..edf760ad7 100755
--- a/test/utils/join3.exp
+++ b/test/utils/join3.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/join4.exp b/test/utils/join4.exp
index 27f52fd56..4c39be92e 100755
--- a/test/utils/join4.exp
+++ b/test/utils/join4.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/list.exp b/test/utils/list.exp
index 5b34b4866..9da154962 100755
--- a/test/utils/list.exp
+++ b/test/utils/list.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/man.exp b/test/utils/man.exp
index 71dc703aa..9576793dc 100755
--- a/test/utils/man.exp
+++ b/test/utils/man.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/protocol-print.exp b/test/utils/protocol-print.exp
index 12ad98a41..4209bbf39 100755
--- a/test/utils/protocol-print.exp
+++ b/test/utils/protocol-print.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/seccomp-print.exp b/test/utils/seccomp-print.exp
index 930df1517..09e09ca84 100755
--- a/test/utils/seccomp-print.exp
+++ b/test/utils/seccomp-print.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp
index fba76fa7a..1d4dc9ae4 100755
--- a/test/utils/shutdown.exp
+++ b/test/utils/shutdown.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/shutdown2.exp b/test/utils/shutdown2.exp
index f92c8b2b1..0e063d257 100755
--- a/test/utils/shutdown2.exp
+++ b/test/utils/shutdown2.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/shutdown3.exp b/test/utils/shutdown3.exp
index 4c2c616b2..1e55e5a41 100755
--- a/test/utils/shutdown3.exp
+++ b/test/utils/shutdown3.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/shutdown4.exp b/test/utils/shutdown4.exp
index 7d3c27164..39a0308ff 100755
--- a/test/utils/shutdown4.exp
+++ b/test/utils/shutdown4.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/top.exp b/test/utils/top.exp
index 73903d11f..a1a8e8b44 100755
--- a/test/utils/top.exp
+++ b/test/utils/top.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/trace.exp b/test/utils/trace.exp
index 614580016..37c0b0f30 100755
--- a/test/utils/trace.exp
+++ b/test/utils/trace.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 30 6set timeout 30
diff --git a/test/utils/tree.exp b/test/utils/tree.exp
index a64c98bca..977dbb360 100755
--- a/test/utils/tree.exp
+++ b/test/utils/tree.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index a59a9544f..9dd3b67a3 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -1,6 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6export MALLOC_CHECK_=3 6export MALLOC_CHECK_=3
diff --git a/test/utils/version.exp b/test/utils/version.exp
index 35dfc1c86..5bff55409 100755
--- a/test/utils/version.exp
+++ b/test/utils/version.exp
@@ -1,6 +1,6 @@
1#!/usr/bin/expect -f 1#!/usr/bin/expect -f
2# This file is part of Firejail project 2# This file is part of Firejail project
3# Copyright (C) 2014-2017 Firejail Authors 3# Copyright (C) 2014-2018 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 10