summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-10 12:49:42 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-10 12:49:42 +0000
commitc8ab2647eb2aef0bbe9bb820ed516b7358a39a36 (patch)
tree87c584d98e26ed2162dfb865de2787f2cb8c2201
parent77eddc0dd58fe19ac3dba8999473b3a9fdd802d6 (diff)
downloaddrakx-net-c8ab2647eb2aef0bbe9bb820ed516b7358a39a36.tar
drakx-net-c8ab2647eb2aef0bbe9bb820ed516b7358a39a36.tar.gz
drakx-net-c8ab2647eb2aef0bbe9bb820ed516b7358a39a36.tar.bz2
drakx-net-c8ab2647eb2aef0bbe9bb820ed516b7358a39a36.tar.xz
drakx-net-c8ab2647eb2aef0bbe9bb820ed516b7358a39a36.zip
(main) honnor canceling interactive firewall
-rw-r--r--NEWS1
-rw-r--r--lib/network/drakfirewall.pm4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index af4e442..1332f77 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- drakfirewall:
o do not display any banner when embedded (#44732)
+ o honnor canceling interactive firewall
0.52:
- wireless backend:
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 5051eb6..c20ce44 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -283,7 +283,9 @@ sub main {
($disabled, $servers, $unlisted, $log_net_drop) = choose_allowed_services($in, $disabled, $servers, $unlisted, $log_net_drop) or return;
- choose_watched_services($in, $servers, $unlisted) unless $disabled;
+ if (!$disabled) {
+ choose_watched_services($in, $servers, $unlisted) or return;
+ }
my $ports = to_ports($servers, $unlisted);
set_ports($in->do_pkgs, $disabled, $ports, $log_net_drop, $in) or return;