aboutsummaryrefslogtreecommitdiffstats
path: root/lib/AdminPanel
diff options
context:
space:
mode:
authorMatteo Pasotti <matteo.pasotti@gmail.com>2015-01-11 19:52:53 +0100
committerMatteo Pasotti <matteo.pasotti@gmail.com>2015-01-11 19:52:53 +0100
commitebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc (patch)
tree09ad01652b78d77fecded63cfd2a949686fee0e6 /lib/AdminPanel
parentb321b3956625c991b72155aaed7c122eea6d6a06 (diff)
downloadmanatools-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar
manatools-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar.gz
manatools-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar.bz2
manatools-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar.xz
manatools-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.zip
fixed bug afflicting configuration/selection of net interfaces protected by shorewall
Diffstat (limited to 'lib/AdminPanel')
-rw-r--r--lib/AdminPanel/Module/Firewall.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/AdminPanel/Module/Firewall.pm b/lib/AdminPanel/Module/Firewall.pm
index b40f5cdd..492740a0 100644
--- a/lib/AdminPanel/Module/Firewall.pm
+++ b/lib/AdminPanel/Module/Firewall.pm
@@ -866,15 +866,14 @@ Which interfaces should be protected?
"),
list => [
map {
- {
+ {
+ id => $_,
text => network::tools::get_interface_description($self->net(), $_),
val => \$net_zone{$_},
type => 'bool'
};
} (sort keys %net_zone) ]
});
-
- ($conf->{net_zone}, $conf->{loc_zone}) = partition { $net_zone{$_} } keys %net_zone;
if(!defined($retvals))
{
@@ -882,9 +881,13 @@ Which interfaces should be protected?
}
else
{
+ # it was: ($conf->{net_zone}, $conf->{loc_zone}) = partition { $net_zone{$_} } keys %net_zone;
+ foreach my $net_int (@{$retvals})
+ {
+ push (@{$conf->{net_zone}}, $net_int);
+ }
return $retvals;
}
-
}
#=============================================================
are/drakx/diff/?h=topic/extlinux&id=b05aa3c20fa88b515ce4fb4686a656f6a95f9f3d'>Diffstat (limited to 'perl-install/security')
-rw-r--r--perl-install/security/main.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/security/main.pm b/perl-install/security/main.pm
index 0ed54f84c..87d331ff3 100644
--- a/perl-install/security/main.pm
+++ b/perl-install/security/main.pm
@@ -157,8 +157,7 @@ sub draksec_main {
[ gtkshow(new Gtk::Label(_($i))), $security_checks_value{$i} ];
# , gtksignal_connect(new Gtk::Button(_("Help")), 'clicked' => sub { show_msec_help($i) } ) ]
}
- } ($msec->get_default_checks)),
- new Gtk::Label(_("Periodic Checks 2"))))),
+ } ($msec->get_default_checks))))),
new Gtk::Label(_("Periodic Checks")));