From ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc Mon Sep 17 00:00:00 2001 From: Matteo Pasotti Date: Sun, 11 Jan 2015 19:52:53 +0100 Subject: fixed bug afflicting configuration/selection of net interfaces protected by shorewall --- lib/AdminPanel/Module/Firewall.pm | 11 +++++++---- 1 file 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; } - } #============================================================= -- cgit v1.2.1