aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2022-01-13 19:29:28 -0500
committerLibravatar netblue30 <netblue30@protonmail.com>2022-01-13 19:29:28 -0500
commitb0eb9731f0fa40871f78a0592ae634a77fbcc901 (patch)
tree4c752afdb23f2ff765a8387199442dbcf7c75153
parentMerge pull request #4853 from glitsj16/wget2-fixes (diff)
downloadfirejail-b0eb9731f0fa40871f78a0592ae634a77fbcc901.tar.gz
firejail-b0eb9731f0fa40871f78a0592ae634a77fbcc901.tar.zst
firejail-b0eb9731f0fa40871f78a0592ae634a77fbcc901.zip
fix warzone2100 (Debian 11)
-rw-r--r--etc/inc/disable-programs.inc1
-rw-r--r--etc/profile-m-z/warzone2100.profile7
-rw-r--r--src/fnettrace/main.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc
index 2f45e1288..e1500762b 100644
--- a/etc/inc/disable-programs.inc
+++ b/etc/inc/disable-programs.inc
@@ -981,6 +981,7 @@ blacklist ${HOME}/.local/share/wesnoth
981blacklist ${HOME}/.local/share/wormux 981blacklist ${HOME}/.local/share/wormux
982blacklist ${HOME}/.local/share/xplayer 982blacklist ${HOME}/.local/share/xplayer
983blacklist ${HOME}/.local/share/xreader 983blacklist ${HOME}/.local/share/xreader
984blacklist ${HOME}/.local/share/warzone2100-3.*
984blacklist ${HOME}/.local/share/zathura 985blacklist ${HOME}/.local/share/zathura
985blacklist ${HOME}/.local/state/pipewire 986blacklist ${HOME}/.local/state/pipewire
986blacklist ${HOME}/.lv2 987blacklist ${HOME}/.lv2
diff --git a/etc/profile-m-z/warzone2100.profile b/etc/profile-m-z/warzone2100.profile
index 46dca0547..058cd7da3 100644
--- a/etc/profile-m-z/warzone2100.profile
+++ b/etc/profile-m-z/warzone2100.profile
@@ -7,19 +7,22 @@ include warzone2100.local
7include globals.local 7include globals.local
8 8
9noblacklist ${HOME}/.warzone2100-3.* 9noblacklist ${HOME}/.warzone2100-3.*
10noblacklist ${HOME}/.local/share/warzone2100-3.*
10 11
11include disable-common.inc 12include disable-common.inc
12include disable-devel.inc 13include disable-devel.inc
13include disable-exec.inc 14include disable-exec.inc
14include disable-interpreters.inc 15include disable-interpreters.inc
15include disable-programs.inc 16include disable-programs.inc
16include disable-shell.inc 17#include disable-shell.inc - problems on Debian 11
17 18
18mkdir ${HOME}/.warzone2100-3.1 19mkdir ${HOME}/.warzone2100-3.1
19mkdir ${HOME}/.warzone2100-3.2 20mkdir ${HOME}/.warzone2100-3.2
20whitelist ${HOME}/.warzone2100-3.1 21whitelist ${HOME}/.warzone2100-3.1
21whitelist ${HOME}/.warzone2100-3.2 22whitelist ${HOME}/.warzone2100-3.2
23whitelist ${HOME}/.local/share/warzone2100-3.3.0 # config dir moved under .local/share
22whitelist /usr/share/games 24whitelist /usr/share/games
25whitelist /usr/share/gdm
23include whitelist-common.inc 26include whitelist-common.inc
24include whitelist-runuser-common.inc 27include whitelist-runuser-common.inc
25include whitelist-usr-share-common.inc 28include whitelist-usr-share-common.inc
@@ -42,6 +45,6 @@ shell none
42tracelog 45tracelog
43 46
44disable-mnt 47disable-mnt
45private-bin warzone2100 48private-bin which,sh,bash,dash,warzone2100
46private-dev 49private-dev
47private-tmp 50private-tmp
diff --git a/src/fnettrace/main.c b/src/fnettrace/main.c
index ab65268fd..352d61bbd 100644
--- a/src/fnettrace/main.c
+++ b/src/fnettrace/main.c
@@ -119,6 +119,8 @@ static void hnode_free(HNode *elem) {
119 htable[h] = elem->hnext; 119 htable[h] = elem->hnext;
120 else 120 else
121 prev->hnext = elem->hnext; 121 prev->hnext = elem->hnext;
122 if (elem->hostname)
123 free(elem->hostname);
122 free(elem); 124 free(elem);
123} 125}
124 126