extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-08 00:34:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of zone exclusion

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8168 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-02-09 17:36:33 +00:00
parent 3574d2b099
commit 60080486ec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-perl/Shorewall/Chains.pm
View File

@ -592,7 +592,7 @@ sub use_input_chain($) {
# #
my $chainref = $filter_table->{zone_input_chain $interfaceref->{zone}}; my $chainref = $filter_table->{zone_input_chain $interfaceref->{zone}};
return 1 if $chainref; return 0 if $chainref;
# #
# Use the '<zone>2fw' chain if it is referenced. # Use the '<zone>2fw' chain if it is referenced.
# #
@ -631,7 +631,7 @@ sub use_output_chain($) {
# #
my $chainref = $filter_table->{zone_output_chain $interfaceref->{zone}}; my $chainref = $filter_table->{zone_output_chain $interfaceref->{zone}};
return 1 if $chainref; return 0 if $chainref;
# #
# Use the 'fw2<zone>' chain if it is referenced. # Use the 'fw2<zone>' chain if it is referenced.
# #
@ -1145,7 +1145,7 @@ sub do_test ( $$ )
validate_mark $testval; validate_mark $testval;
$testval = join('/', $testval, in_hex($mask) ) unless ( $testval =~ '/' ); $testval = join( '/', $testval, in_hex($mask) ) unless ( $testval =~ '/' );
"$match $testval "; "$match $testval ";
} }

4
Shorewall-perl/prog.functions
View File

@ -242,9 +242,9 @@ debug_restore_input() {
chain=${first#:} chain=${first#:}
if [ "x$second" = x- ]; then if [ "x$second" = x- ]; then
$IPTABLES -t $table -N $chain do_iptables -t $table -N $chain
else else
$IPTABLES -t $table -P $chain $second do_iptables -t $table -P $chain $second
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then