Avoid double-setting proxy arp flags

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1630 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall2/changelog.txt

@@ -83,3 +83,5 @@ Changes since 2.0.3
 39) Relax OpenVPN source port restrictions.
 
 40) Implement DELAYBLACKLISTLOAD.
+
+41) Avoid double-setting proxy arp flags.

Shorewall2/firewall

@@ -1855,7 +1855,8 @@ setup_proxy_arp() {
     done < $TMP_DIR/proxyarp
 
     for interface in $resetlist; do
-	run_and_save_command "echo 0 > /proc/sys/net/ipv4/conf/$interface/proxy_arp"
+	list_search $interface $setlist || \
+	    run_and_save_command "echo 0 > /proc/sys/net/ipv4/conf/$interface/proxy_arp"
     done
 
     for interface in $setlist; do

Shorewall2/releasenotes.txt

@@ -61,11 +61,6 @@ Problems corrected since 2.1.8
 3)  With complex proxy arp configurations involving two or more 
     ordered pairs of interfaces, the /proc/sys/net/ipv4/conf/*/proxy_arp
     flags were sometimes set incorrectly. This has been fixed.
-
-    Users looking at their restore file (generated by "shorewall save")
-    may see that one of these flags might be first reset then set in rapid
-    succession. This is expected and is harmless since the correct value
-    (1) results.
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0 to Shorewall 2.1: