summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-01-14 21:28:56 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-01-14 21:28:56 +0000
commit2962ff3054e268200e8750f8b82dcd3a09926d0e (patch)
tree886179f643facdbebbbfbdd0b1ceaced05e8da4e
parent434106be17f7a91b41c7b88b48111017ae7f688f (diff)
downloaddrakx-net-2962ff3054e268200e8750f8b82dcd3a09926d0e.tar
drakx-net-2962ff3054e268200e8750f8b82dcd3a09926d0e.tar.gz
drakx-net-2962ff3054e268200e8750f8b82dcd3a09926d0e.tar.bz2
drakx-net-2962ff3054e268200e8750f8b82dcd3a09926d0e.tar.xz
drakx-net-2962ff3054e268200e8750f8b82dcd3a09926d0e.zip
Proper fix for #46256, now handling Cancel button correctly.
-rw-r--r--lib/network/drakfirewall.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 5051eb6..aa52e9b 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -274,6 +274,9 @@ Please select which network activities should be watched."),
]) or return;
my ($rules, $ports) = partition { exists $_->{ifw_rule} } grep { $_->{ifw} } @l;
set_ifw($in->do_pkgs, $enabled, [ map { $_->{ifw_rule} } @$rules ], to_ports($ports));
+
+ # return something to say that we are done ok
+ $rules, $ports;
}
sub main {
@@ -283,7 +286,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;