From 84fbca49178dde8008c7573fbf2c5a6cd7e023c8 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 22 Apr 2007 03:11:34 +0000
Subject: [PATCH] update other components for ROUTE_FILTER/LOG_MARTIAN changes

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

diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt
index 3996b9150..b4dda3334 100644
--- a/Shorewall-common/changelog.txt
+++ b/Shorewall-common/changelog.txt
@@ -8,6 +8,8 @@ Changes in 3.9.4
 
 4)  Fix arp_ignore.
 
+5)  Re-work ROUTE_FILTER and LOG_MARTIANS.
+
 Changes in 3.9.3
 
 1)  Apply Steven Springl's patch for port checking.
diff --git a/Shorewall-common/lib.config b/Shorewall-common/lib.config
index dc95a400f..1752ad5a9 100644
--- a/Shorewall-common/lib.config
+++ b/Shorewall-common/lib.config
@@ -1879,7 +1879,7 @@ do_initialize() {
 		;;
 	esac
     else
-	ROUTE_FILTER=yes
+	ROUTE_FILTER=
     fi
 
     if [ -n "$LOG_MARTIANS" ]; then
@@ -1898,7 +1898,7 @@ do_initialize() {
 		;;
 	esac
     else
-	LOG_MARTIANS=yes
+	LOG_MARTIANS=
     fi
 
     [ -n "${BLACKLIST_DISPOSITION:=DROP}" ]
diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index 45b04021f..c935e577f 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -22,7 +22,10 @@ Problems corrected in 3.9.4.
 
 2)  logmartions=0 was being treated the same as logmartians=1.
 
-3)  arp_ignore caused an internal error in validate_interfaces_file().
+3)  The 'arp_ignore' interface option caused an internal error in
+    validate_interfaces_file() and other errors.
+
+4)  The 'detectnets' option was accepted but did nothing.
 
 Other changes in Shorewall 3.9.4