From bf5018e62dfaa2e1557c957548b214c750617bc0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 28 Apr 2006 02:48:18 +0000
Subject: [PATCH] Fix 'detectnets'

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

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 122ea04fb..acc53222f 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -2,6 +2,8 @@ Changes in 3.2.0 Beta 6
 
 1)  Fix tc "notfound" errors when 'restart' is run out of ip-up.local.
 
+2)  Allow 'detectnets' to work.
+
 Changes in 3.2.0 Beta 5
 
 1)  Fix compilation problem on LEAF Bering.
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 625895517..17a2983a0 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -1080,7 +1080,7 @@ __EOF__
 		detectnets)
 		    [ -n "$wildcard" ] && \
 			fatal_error "The \"detectnets\" option may not be used with a wild-card interface"
-		    [ -n $EXPORT ] && \
+		    [ -n "$EXPORT" ] && \
 			fatal_error "'detectnets' not permitted with the -e run-line option"
 		    ;;
 		routeback)
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 2603c0cd7..ab39471fa 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -33,6 +33,13 @@ Problems Corrected in 3.2.0 Beta 6
     script, some of the utilities like 'tc' and 'ip6tables' were not
     on the PATH.
 
+2)  In previous 3.2.0 releases, 'detectnets' in /etc/shorewall/interfaces
+    produced an error message:
+
+	ERROR: 'detectnets' not permitted with the -e run-line option
+
+    even when the -e option had not been specified.
+
 Other changes in 3.2.0 Beta 6
 
 None.