From f3b86ee2c5787916ce1e11509e55f7d759c89c65 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 26 Feb 2006 17:10:16 +0000
Subject: [PATCH] Fix restore if 'set --' used in an extension script

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3588 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    | 3 +++
 Shorewall/compiler         | 3 ++-
 Shorewall/releasenotes.txt | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 820a54007..2d69f1b51 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -96,3 +96,6 @@ Changes in 3.1.x.
 3.1.9
 
 41)  Fix Provider route generation when a specific gateway is specified.
+
+42)  Be sure that restore file name is preserved regardless of 'set --' in
+     define_firewall().)
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 709303fe9..f58c46d06 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -8586,6 +8586,7 @@ __EOF__
 # Start/Restart/Reload the firewall
 #
 define_firewall() {
+    local restore_file=\$1
 __EOF__
 
     INDENT="    "
@@ -8686,7 +8687,7 @@ __EOF__
     cat >&3 << __EOF__
 
     if [ \$COMMAND = restore ]; then
-	iptables-restore < \$1
+	iptables-restore < \$restore_file
     fi
 
 __EOF__
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index fb1f93c1c..a29e94966 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -32,6 +32,9 @@ Problems Corrected in 3.1.9
 1)  Route generation is now correct when a specific gateway IP address is
     given in the GATEWAY column of the providers file.
 
+2)  If any action has an associated extension script (like the 'Limit'
+    standard action) then 'shorewall restore' would fail.
+
 Other changes in 3.1.9
 
 None.
@@ -328,6 +331,3 @@ New Features:
     07:09:05 Restarting Shorewall....
     07:09:08 done.
     gateway:/etc/shorewall #
-
-
-