diff options
| author | Matteo Pasotti <matteo.pasotti@gmail.com> | 2015-01-11 19:52:53 +0100 |
|---|---|---|
| committer | Matteo Pasotti <matteo.pasotti@gmail.com> | 2015-01-11 19:52:53 +0100 |
| commit | ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc (patch) | |
| tree | 09ad01652b78d77fecded63cfd2a949686fee0e6 /lib/AdminPanel/Module | |
| parent | b321b3956625c991b72155aaed7c122eea6d6a06 (diff) | |
| download | colin-keep-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar colin-keep-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar.gz colin-keep-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar.bz2 colin-keep-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.tar.xz colin-keep-ebbe44a39d2c1f6fad0785fc3ba3eb59c31396fc.zip | |
fixed bug afflicting configuration/selection of net interfaces protected by shorewall
Diffstat (limited to 'lib/AdminPanel/Module')
| -rw-r--r-- | lib/AdminPanel/Module/Firewall.pm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/AdminPanel/Module/Firewall.pm b/lib/AdminPanel/Module/Firewall.pm index b40f5cd..492740a 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; } - } #============================================================= |