summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-07-08 06:16:24 +0000
committerOlivier Blin <oblin@mandriva.org>2005-07-08 06:16:24 +0000
commit8027606fc46bd768997ade80e38e99fede0d7e46 (patch)
tree27087b1b33a14d413ce5e70f00ef3a3a6456c1f3 /perl-install
parent66cb66f6812eb3c32df580edecb634d8e64196e3 (diff)
downloaddrakx-backup-do-not-use-8027606fc46bd768997ade80e38e99fede0d7e46.tar
drakx-backup-do-not-use-8027606fc46bd768997ade80e38e99fede0d7e46.tar.gz
drakx-backup-do-not-use-8027606fc46bd768997ade80e38e99fede0d7e46.tar.bz2
drakx-backup-do-not-use-8027606fc46bd768997ade80e38e99fede0d7e46.tar.xz
drakx-backup-do-not-use-8027606fc46bd768997ade80e38e99fede0d7e46.zip
always enable firewall if security level >= 3 (even if no ports have to be opened)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm7
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});
}
}