(main) honnor canceling interactive firewall

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;