From 38ead4778b90d0dafae7eba6076df680ea154b98 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 29 Apr 2004 16:47:24 +0000
Subject: [PATCH] Don't make the restore-base executable

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

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index f8159a894..dfbad4673 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5353,9 +5353,9 @@ define_firewall() # $1 = Command (Start or Restart)
 
     save_command 'iptables-restore << EOF'
 
-    mv -f /var/lib/shorewall/restore-$$ /var/lib/shorewall/restore-base
+    # 'shorewall save' appends the iptables-save output and 'EOF'
 
-    chmod +x /var/lib/shorewall/restore-base
+    mv -f /var/lib/shorewall/restore-$$ /var/lib/shorewall/restore-base
 
 }
 
diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall
index 403738a44..5b208cecf 100755
--- a/Shorewall2/shorewall
+++ b/Shorewall2/shorewall
@@ -971,6 +971,7 @@ case "$1" in
 		    if iptables-save >> /var/lib/shorewall/restore-$$ ; then
 			echo EOF >> /var/lib/shorewall/restore-$$
 			mv -f /var/lib/shorewall/restore-$$ /var/lib/shorewall/restore
+			chmod +x /var/lib/shorewall/restore
 			echo "   Currently-running Configuration Saved"
                     else
 			rm -f /var/lib/shorewall/restore-$$