summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-20 19:52:44 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-20 19:52:44 +0000
commit09f4ecacb5952ccf2d0c7ea8193e669ef3383d7d (patch)
treef0b18d33a4df7545415b1abcc0724675ad49732b
parent3e02c819172004414dff81e10ac609684323c5d5 (diff)
downloaddrakx-net-09f4ecacb5952ccf2d0c7ea8193e669ef3383d7d.tar
drakx-net-09f4ecacb5952ccf2d0c7ea8193e669ef3383d7d.tar.gz
drakx-net-09f4ecacb5952ccf2d0c7ea8193e669ef3383d7d.tar.bz2
drakx-net-09f4ecacb5952ccf2d0c7ea8193e669ef3383d7d.tar.xz
drakx-net-09f4ecacb5952ccf2d0c7ea8193e669ef3383d7d.zip
(set_ifw) fix cleaning old rules
issue introduced by blino in r239468 on Mar 14 2008: "remove old Ifw rule if needed"
-rw-r--r--NEWS1
-rw-r--r--lib/network/drakfirewall.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 91dcf97..2b89313 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
(might help #1015 & the like)
- drakfirewall:
o fix listing NFS ports
+ o fix cleaning old rules
1.4:
- adapt to drakxtools-13.92+ API change
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 6ce6b13..4a18a04 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -291,7 +291,7 @@ sub set_ifw {
}
substInFile {
- undef $_ if $_ eq "INCLUDE /etc/ifw/rules", "iptables -I INPUT 2 -j Ifw";
+ undef $_ if member($_, "INCLUDE /etc/ifw/rules", "iptables -I INPUT 2 -j Ifw");
} "$::prefix/etc/shorewall/start";
network::shorewall::set_in_file('start', $enabled, "INCLUDE /etc/ifw/start", "INCLUDE /etc/ifw/rules", "iptables -I INPUT 1 -j Ifw");
network::shorewall::set_in_file('stop', $enabled, "iptables -D INPUT -j Ifw", "INCLUDE /etc/ifw/stop");