From 8e96315be9031fab37a65ee5f49e007eaebb7573 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Tue, 4 Mar 2008 23:05:05 +0000 Subject: protect all interfaces by default, let the user unselect local ones (#27978) --- lib/network/shorewall.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/network') diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm index ce90d4e..a78416e 100644 --- a/lib/network/shorewall.pm +++ b/lib/network/shorewall.pm @@ -43,11 +43,11 @@ sub dev_to_shorewall { } sub get_net_zone_interfaces { - my ($net) = @_; + my ($net, $all_intf) = @_; #- read shorewall configuration first my @interfaces = map { $_->[1] } grep { $_->[0] eq 'net' } get_config_file('interfaces'); #- else try to find the best interface available - @interfaces ? @interfaces : dev_to_shorewall(network::tools::get_default_gateway_interface($net)); + @interfaces ? @interfaces : @{$all_intf || []}; } sub get_zones { @@ -57,7 +57,7 @@ sub get_zones { #- find all interfaces but alias interfaces my @all_intf = grep { !/:/ } uniq(keys(%{$net->{ifcfg}}), detect_devices::get_net_interfaces()); my %net_zone = map { $_ => undef } @all_intf; - $net_zone{$_} = 1 foreach get_net_zone_interfaces($net); + $net_zone{$_} = 1 foreach get_net_zone_interfaces($net, \@all_intf); $o_in and $o_in->ask_from('', N("Please select the interfaces that will be protected by the firewall. All interfaces directly connected to Internet should be selected, -- cgit v1.2.1