From 70c7dbd4868ffdbcf4c9e78af257633cd00968d3 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 2 Aug 2006 20:18:17 +0000
Subject: [PATCH] Merge 'stop' fix from 3.2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4292 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/compiler | 2 ++
 Shorewall/firewall | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Shorewall/compiler b/Shorewall/compiler
index d57f4eff8..2596f2b12 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -7844,6 +7844,8 @@ __EOF__
 	    qt arp -i \$external -d \$address pub
 	    [ -z "\${haveroute}\${NOROUTES}" ] && qt ip route del \$address dev \$interface
 	done < \${VARDIR}/proxyarp
+
+	rm -f \${VARDIR}/proxyarp
     fi
 
     for f in /proc/sys/net/ipv4/conf/*; do
diff --git a/Shorewall/firewall b/Shorewall/firewall
index 5350a9df0..418082f22 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -1269,7 +1269,7 @@ delete_proxy_arp() {
 	rm -f ${VARDIR}/proxyarp
     fi
 
-    [ -d $STATEDIR ] && touch $STATEDIR/proxyarp
+    [ -d ${VARDIR} ] && touch ${VARDIR}/proxyarp
 
     case $COMMAND in
 	stop|clear)
@@ -1306,7 +1306,7 @@ delete_nat() {
 	rm -f ${VARDIR}/nat
     fi
 
-    [ -d $STATEDIR ] && touch $STATEDIR/nat
+    [ -d ${VARDIR} ] && touch ${VARDIR}/nat
 }
 
 #