summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2008-12-17 14:20:43 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2008-12-17 14:20:43 +0000
commit6182d79552fa9af10a82e24b7b6709918dd2266c (patch)
treeb95a8e14487aa9a396e96d4b67a480afa230af96
parenteb191cc80ab49fde915cbab13cfe652862921de6 (diff)
downloaddrakx-net-6182d79552fa9af10a82e24b7b6709918dd2266c.tar
drakx-net-6182d79552fa9af10a82e24b7b6709918dd2266c.tar.gz
drakx-net-6182d79552fa9af10a82e24b7b6709918dd2266c.tar.bz2
drakx-net-6182d79552fa9af10a82e24b7b6709918dd2266c.tar.xz
drakx-net-6182d79552fa9af10a82e24b7b6709918dd2266c.zip
Reverted commit 247997 (#46256).
-rw-r--r--lib/network/drakfirewall.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index c20ce44..5051eb6 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -283,9 +283,7 @@ sub main {
($disabled, $servers, $unlisted, $log_net_drop) = choose_allowed_services($in, $disabled, $servers, $unlisted, $log_net_drop) or return;
- if (!$disabled) {
- choose_watched_services($in, $servers, $unlisted) or return;
- }
+ choose_watched_services($in, $servers, $unlisted) unless $disabled;
my $ports = to_ports($servers, $unlisted);
set_ports($in->do_pkgs, $disabled, $ports, $log_net_drop, $in) or return;