holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix more physical name issues

Browse Source
This commit is contained in:
Tom Eastep 2010-12-19 16:38:24 -08:00
parent 44f001388a
commit 262b4044f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Proxyarp.pm
View File

@ -125,15 +125,15 @@ sub setup_proxy_arp() {
$first_entry = 0; $first_entry = 0;
} }
fatal_error "Unknown interface ($external)" unless known_interface $external; fatal_error "Unknown interface ($external)" unless known_interface $external, 1;
fatal_error "Wildcard interface ($external) not allowed" if $external =~ /\+$/; fatal_error "Wildcard interface ($external) not allowed" if $external =~ /\+$/;
$reset{$external} = 1 unless $set{$external}; $reset{$external} = 1 unless $set{$external};
my $extphy = physical_name $external; my $extphy = get_physical $external;
my $physical = '-'; my $physical = '-';
if ( $interface ne '-' ) { if ( $interface ne '-' ) {
fatal_error "Unknown interface ($interface)" unless known_interface $interface; fatal_error "Unknown interface ($interface)" unless known_interface $interface, 1;
fatal_error "Wildcard interface ($interface) not allowed" if $interface =~ /\+$/; fatal_error "Wildcard interface ($interface) not allowed" if $interface =~ /\+$/;
$physical = physical_name $interface; $physical = physical_name $interface;
$set{$interface} = 1; $set{$interface} = 1;

2
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -1334,7 +1334,7 @@ sub find_interfaces_by_option1( $ ) {
my $wild = 0; my $wild = 0;
for my $interface ( sort { $interfaces{$a}->{number} <=> $interfaces{$b}->{number} } for my $interface ( sort { $interfaces{$a}->{number} <=> $interfaces{$b}->{number} }
keys %interfaces ) { ( grep $interfaces{$_}{root}, keys %interfaces ) ) {
my $interfaceref = $interfaces{$interface}; my $interfaceref = $interfaces{$interface};
next unless defined $interfaceref->{physical}; next unless defined $interfaceref->{physical};