From 0ab2143d689c6d25b96ec31b76ddc5d65c641e8e Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 15 Apr 2006 22:40:03 +0000
Subject: [PATCH] Avoid unwanted deletion of SNAT addresses

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

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index ba6b277d3..cab76434b 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -11,6 +11,8 @@ Changes in 3.2.0 Beta 5
 
 5)  Rename the rtrules file to route_rules.
 
+6)  Fix deletion of SNAT ip addresses.
+
 Changes in 3.2.0 Beta 4
 
 1)  Fix 'routeback' with bridge ports.
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 3ac2cdf5b..9e33b86ab 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -6934,7 +6934,7 @@ __EOF__
 		    ;;
 	    esac
 
-	    if [ -n"$add_snat_aliases" ]; then
+	    if [ -n "$add_snat_aliases" ]; then
 		for address in $(separate_list $addresses); do
 		    address=${address%:)}
 		    if [ -n "$address" ]; then
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index fa832278f..4864e6925 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -43,6 +43,9 @@ Problems Corrected in 3.2.0 Beta 5
 3)  Previously, if your kernel did not supply the mangle table FORWARD chain
     then "shorewall [re]start" would fail.
 
+4)  Regardless of the setting of ADD_SNAT_IPADDRS, Shorewall will delete
+    the ADDRESS in an SNAT rule (/etc/shorewall/masq) during [re]start.
+
 Other changes in 3.2.0 Beta 5
 
 1)  The "shorewall refresh" command no longer refreshes traffic shaping.