From: Manuel Munz <freifunk@somakoma.de>
Date: Sat, 12 Feb 2011 17:09:16 +0000 (+0000)
Subject: luci-0.10: merge r6877
X-Git-Tag: 0.10.0~181
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=18074ab09c85f0a94f56d3435591555f9f8f3dca;p=oweals%2Fluci.git

luci-0.10: merge r6877
---

diff --git a/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan b/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan
index d0795b629..ed40ff48d 100644
--- a/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan
+++ b/contrib/package/freifunk-firewall/files/etc/hotplug.d/firewall/23-restricted-wan
@@ -18,8 +18,8 @@ clear_restricted_gw()
 		config_get gateway "$state" gateway
 
 		logger -t firewall.freifunk "removing local restriction to $iface($gateway)"
-		iptables -D "zone_${INTERFACE}_ACCEPT" -i ! $ifname -o $ifname -d $ipaddr/$netmask -j REJECT
-		iptables -D "zone_${INTERFACE}_ACCEPT" -i ! $ifname -o $ifname -d $gateway -j ACCEPT
+		iptables -D "zone_${INTERFACE}_ACCEPT" ! -i $ifname -o $ifname -d $ipaddr/$netmask -j REJECT
+		iptables -D "zone_${INTERFACE}_ACCEPT" ! -i $ifname -o $ifname -d $gateway -j ACCEPT
 
 		uci_revert_state firewall "$state"
 	fi
@@ -56,8 +56,8 @@ if [ "$ACTION" = add ]; then
 
 		if [ "$local_restrict" = 1 ]; then
 			logger -t firewall.freifunk "restricting local access to $DEVICE($gateway)"
-			iptables -I "zone_${INTERFACE}_ACCEPT" -i ! $DEVICE -o $DEVICE -d $ipaddr/$netmask -j REJECT
-			iptables -I "zone_${INTERFACE}_ACCEPT" -i ! $DEVICE -o $DEVICE -d $gateway -j ACCEPT
+			iptables -I "zone_${INTERFACE}_ACCEPT" ! -i $DEVICE -o $DEVICE -d $ipaddr/$netmask -j REJECT
+			iptables -I "zone_${INTERFACE}_ACCEPT" ! -i $DEVICE -o $DEVICE -d $gateway -j ACCEPT
 
 			local state="restricted_gw_${INTERFACE}"
 			uci_set_state firewall "$state" "" restricted_gw_state