From 60080486ecb69eb659a3912b415dc1563b081118 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 9 Feb 2008 17:36:33 +0000
Subject: [PATCH] Fix handling of zone exclusion

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8168 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Chains.pm | 6 +++---
 Shorewall-perl/prog.functions      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm
index 16c64c129..2312ee07c 100644
--- a/Shorewall-perl/Shorewall/Chains.pm
+++ b/Shorewall-perl/Shorewall/Chains.pm
@@ -592,7 +592,7 @@ sub use_input_chain($) {
     #
     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.
     #
@@ -631,7 +631,7 @@ sub use_output_chain($) {
     #    
     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.
     #
@@ -1145,7 +1145,7 @@ sub do_test ( $$ )
 
     validate_mark $testval;
 
-    $testval = join('/', $testval, in_hex($mask) ) unless ( $testval =~ '/' );
+    $testval = join( '/', $testval, in_hex($mask) ) unless ( $testval =~ '/' );
 
     "$match $testval ";
 }
diff --git a/Shorewall-perl/prog.functions b/Shorewall-perl/prog.functions
index 372687f7c..ee66a0198 100644
--- a/Shorewall-perl/prog.functions
+++ b/Shorewall-perl/prog.functions
@@ -242,9 +242,9 @@ debug_restore_input() {
 		chain=${first#:}
 
 		if [ "x$second" = x- ]; then
-		    $IPTABLES -t $table -N $chain
+		    do_iptables -t $table -N $chain
 		else
-		    $IPTABLES -t $table -P $chain $second
+		    do_iptables -t $table -P $chain $second
 		fi
 
 		if [ $? -ne 0 ]; then