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

Fix over-zealous use of physical name; Correct syntax errors

Browse Source
This commit is contained in:
Tom Eastep 2009-11-09 12:38:00 -08:00
parent 893a0c9d42
commit 79b5cb49df
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,7 @@ sub process_one_masq( )
if ( $addresses =~ /^SAME/ ) { if ( $addresses =~ /^SAME/ ) {
fatal_error "The SAME target is no longer supported"; fatal_error "The SAME target is no longer supported";
} elsif ( $addresses eq 'detect' ) { } elsif ( $addresses eq 'detect' ) {
my $variable = get_interface_address $interfaceref->{physical}; my $variable = get_interface_address $interface;
$target = "-j SNAT --to-source $variable"; $target = "-j SNAT --to-source $variable";
if ( interface_is_optional $interface ) { if ( interface_is_optional $interface ) {

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

@ -909,7 +909,7 @@ sub process_interface( $ ) {
if ( $netsref eq 'dynamic' ) { if ( $netsref eq 'dynamic' ) {
my $ipset = "${zone}_" . chain_base $physical; my $ipset = "${zone}_" . chain_base $physical;
$nets = [ "+$ipset" ]; $netsref = [ "+$ipset" ];
$ipsets{$ipset} = 1; $ipsets{$ipset} = 1;
} }
@ -936,8 +936,8 @@ sub process_interface( $ ) {
}; };
if ( $zone ) { if ( $zone ) {
$nets ||= [ allip ]; $netsref ||= [ allip ];
add_group_to_zone( $zone, $zoneref->{type}, $interface, $nets, $hostoptionsref ); add_group_to_zone( $zone, $zoneref->{type}, $interface, $netsref, $hostoptionsref );
add_group_to_zone( $zone, add_group_to_zone( $zone,
$zoneref->{type}, $zoneref->{type},
$interface, $interface,