always enable firewall if security level >= 3 (even if no ports have to be opened)

1 files changed, 2 insertions, 5 deletions

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 4acb70a9e..1b8806e99 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -654,12 +654,9 @@ sub configureNetwork {
 sub configure_firewall {
     my ($o) = @_;
 
-    if (!exists $o->{firewall_ports} && $o->{security} >= 3) {
-	require network::drakfirewall;
-	$o->{firewall_ports} = network::drakfirewall::default_ports($o->do_pkgs);
-    }
-    if ($o->{firewall_ports}) {
+    if (exists $o->{firewall_ports} || $o->{security} >= 3) {
 	require network::drakfirewall;
+	$o->{firewall_ports} ||= network::drakfirewall::default_ports($o->do_pkgs);
 	network::drakfirewall::set_ports($o->do_pkgs, 0, $o->{firewall_ports});
     }
 }