From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 21 Sep 2009 17:44:47 +0000 (+0200)
Subject: firewall: Some changes to fix error messages.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea14c58ac2a3896fa79da218dc4c8574d878e034;p=ipfire-3.x.git

firewall: Some changes to fix error messages.

These changes don't bring any feature but will make
the firewall not complain.
---

diff --git a/src/firewall/functions b/src/firewall/functions
index 0d0bd6682..d8fb5977c 100644
--- a/src/firewall/functions
+++ b/src/firewall/functions
@@ -103,11 +103,9 @@ function _start() {
 	done
 
 	iptables_commit
-	touch /var/lock/subsys/firewall
 }
 
 function _stop() {
 	iptables_flush
 	iptables_commit
-	rm -f /var/lock/subsys/firewall
 }
diff --git a/src/firewall/zones.blue b/src/firewall/zones.blue
index 2f515477b..e9823a577 100644
--- a/src/firewall/zones.blue
+++ b/src/firewall/zones.blue
@@ -35,7 +35,7 @@ function zones_policy_blue() {
 	name=$(uppercase "$device")
 
 	# Accept dhcp traffic
-	macro DHCP -A ZONE_${name}_POLICY -i ${device} -j ACCEPT
+	#macro DHCP -A ZONE_${name}_POLICY -i ${device} -j ACCEPT
 
 	# Mac filter
 	: # TODO
diff --git a/src/firewall/zones.red b/src/firewall/zones.red
index 1b3e4c384..549300c65 100644
--- a/src/firewall/zones.red
+++ b/src/firewall/zones.red
@@ -19,3 +19,20 @@
 #                                                                             #
 ###############################################################################
 
+function zones_red_add() {
+	# $1 = device
+
+	zones_global_add $1
+	zones_policy_red $1
+
+}
+
+function zones_policy_red() {
+	local device
+	local name
+
+	device=$1
+	name=$(uppercase "$device")
+
+	: # TODO
+}