From c8ab2647eb2aef0bbe9bb820ed516b7358a39a36 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 10 Oct 2008 12:49:42 +0000
Subject: (main) honnor canceling interactive firewall

---
 lib/network/drakfirewall.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/network/drakfirewall.pm')

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;
-- 
cgit v1.2.1