From 3247844fa4ff76250f98654d053a86f7fa04cb0a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 26 Nov 2007 22:50:48 +0000
Subject: [PATCH] Retry return status 4 from iptables -- Take 2

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

diff --git a/Shorewall-perl/prog.functions b/Shorewall-perl/prog.functions
index c80d0da82..67fa7a646 100644
--- a/Shorewall-perl/prog.functions
+++ b/Shorewall-perl/prog.functions
@@ -179,32 +179,32 @@ debug_restore_input() {
     #
     # Clear the ruleset 
     #
-    qt $IPTABLES -t mangle -F
-    qt $IPTABLES -t mangle -X
+    qt1 $IPTABLES -t mangle -F
+    qt1 $IPTABLES -t mangle -X
 
     for chain in PREROUTING INPUT FORWARD POSTROUTING; do
-	qt $IPTABLES -t mangle -P $chain ACCEPT
+	qt1 $IPTABLES -t mangle -P $chain ACCEPT
     done
 
-    qt $IPTABLES -t raw    -F
-    qt $IPTABLES -t raw    -X
+    qt1 $IPTABLES -t raw    -F
+    qt1 $IPTABLES -t raw    -X
 
     for chain in PREROUTING OUTPUT; do
-	qt $IPTABLES -t raw -P $chain ACCEPT
+	qt1 $IPTABLES -t raw -P $chain ACCEPT
     done
     
     run_iptables -t nat -F
     run_iptables -t nat -X
 
     for chain in PREROUTING POSTROUTING OUTPUT; do
-	qt $IPTABLES -t nat -P $chain ACCEPT
+	qt1 $IPTABLES -t nat -P $chain ACCEPT
     done
     
-    qt $IPTABLES -t filter -F
-    qt $IPTABLES -t filter -X
+    qt1 $IPTABLES -t filter -F
+    qt1 $IPTABLES -t filter -X
 
     for chain in INPUT FORWARD OUTPUT; do
-	qt $IPTABLES -t filter -P $chain -P ACCEPT
+	qt1 $IPTABLES -t filter -P $chain -P ACCEPT
     done
 
     while read first second rest; do
diff --git a/Shorewall-perl/prog.header b/Shorewall-perl/prog.header
index 0e4a7ba55..0d039b3cc 100644
--- a/Shorewall-perl/prog.header
+++ b/Shorewall-perl/prog.header
@@ -116,7 +116,7 @@ qt()
 # Determine if Shorewall is "running"
 #
 shorewall_is_started() {
-    qt $IPTABLES -L shorewall -n
+    qt1 $IPTABLES -L shorewall -n
 }
 
 #
@@ -387,7 +387,7 @@ in_network() # $1 = IP address, $2 = CIDR network
 #
 chain_exists() # $1 = chain name
 {
-    qt $IPTABLES -L $1 -n
+    qt1 $IPTABLES -L $1 -n
 }
 
 #