From 53ae3fc6e0acc9d6ff37039c1f9a5d9470554691 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 28 Oct 2005 03:18:49 +0000
Subject: [PATCH] Suppress 'ambiguous redirect' errors

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

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 7d783d82b..e0e4f1a9b 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -2,6 +2,8 @@ Changes in 3.0.0 RC 3.
 
 1) ROUTE target and Extended Mark removed from capabilities.
 
+2) Suppress 'ambiguous redirect' error messages.
+
 2) Correct stupid typo in release notes ([rej|drop]NewNot vs. [rej|drop]NewNon)
 
 Changes in 3.0.0 RC 2.
diff --git a/Shorewall/firewall b/Shorewall/firewall
index f4e93dd68..5732f8797 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -2998,7 +2998,7 @@ setup_nat() {
 		    add_ip_aliases=
 		    ;;
 		*)
-		    [ -n "$RETAIN_ALIASES" ] || run_and_save_command qt ip addr del $external dev $iface
+		    [ -n "$RETAIN_ALIASES" -o $COMMAND = check ] || run_and_save_command qt ip addr del $external dev $iface
 		    ;;
 	    esac
 	else
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 70edf9d68..8d6a996f8 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -6,6 +6,12 @@ Problems Corrected in 3.0.0 RC 3:
     Netfilter ROUTE target and extended packet marking so detection and
     reporting of those capabilities has been removed.
 
+2)  Previously, the following message could appear in the error output
+    from the 'check' command:
+
+    "/usr/share/shorewall/firewall:  line 128:  $RESTOREBASE:  ambiguous
+    redirect"
+
 Migration Considerations:
 
 1) The "monitor" command has been eliminated.