From 69df501a4c74e60e85870d0da05b87c90e39adf6 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 28 Aug 2006 20:22:56 +0000
Subject: [PATCH] Load lib.proxyarp if 'proxyarp' option specified for an
 interface

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4472 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    |  5 ++++-
 Shorewall/functions        |  5 ++++-
 Shorewall/releasenotes.txt | 14 +++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index d83816bb2..122b98dcf 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -1,2 +1,5 @@
-Changes in 3.3.0
+Changes in 3.3.1
+
+1)  Load the proxyarp lib when 'proxyarp' option is specified.
+
 
diff --git a/Shorewall/functions b/Shorewall/functions
index bacd121a2..83c007963 100644
--- a/Shorewall/functions
+++ b/Shorewall/functions
@@ -568,7 +568,10 @@ validate_interfaces_file() {
 	    case $option in
 		-)
 		    ;;
-		dhcp|tcpflags|arp_filter|routefilter|logmartians|sourceroute|blacklist|proxyarp|nosmurfs|upnp|-)
+		dhcp|tcpflags|arp_filter|routefilter|logmartians|sourceroute|blacklist|nosmurfs|upnp|-)
+		    ;;
+		proxyarp)
+		    lib_load proxyarp "The 'proxyarp' option"
 		    ;;
 		maclist)
 		    lib_load maclist "The 'maclist' option"
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 0f54cda85..4592cef01 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 3.3.0
+Shorewall 3.3.1
 	  	 
  Note to users upgrading from Shorewall 3.0 or 3.2	 
   	 
@@ -31,11 +31,14 @@ Shorewall 3.3.0
     Please see the "Migration Considerations" below for additional upgrade 	 
     information. 	 
   	 
-Problems Corrected in 3.3.0
+Problems Corrected in 3.3.1
 
-None.
+1)  The 'proxyarp' option in /etc/shorewall/interfaces was not
+    triggering the loading of lib.proxyarp with the result that the
+    option was ignored unless there were also entries in
+    /etc/shorewall/proxyarp.
 
-Other changes in 3.3.0
+Other changes in 3.3.1
 
 None. 
 
@@ -68,7 +71,8 @@ New Features:
       /etc/shorewall/providers.
 
     - lib.proxyarp. Must be available if you have entries in
-      /etc/shorewall/proxyarp.
+      /etc/shorewall/proxyarp or if you specify the 'proxyarp' option
+      in /etc/shorewall/interfaces.
 
     - lib.tc. Must be available if you have entries in
       /etc/shorewall/tcdevices and /etc/shorewall/tcclasses.