From acce9b23791338b8baab8ede7da86d5c886ad2cd Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 24 Aug 2002 18:44:01 +0000
Subject: [PATCH] Fix from 1.3.7a + switch order of RFC1918 and DHCP checking

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@218 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 STABLE/firewall | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/STABLE/firewall b/STABLE/firewall
index 3b5f29a9f..899ba92d2 100755
--- a/STABLE/firewall
+++ b/STABLE/firewall
@@ -2848,6 +2848,16 @@ add_common_rules() {
     # BROADCASTS
     #
     drop_broadcasts `find_broadcasts`
+    ###########################################################################
+    # DHCP
+    #
+    echo "Adding rules for DHCP"
+
+    for interface in `find_interfaces_by_option dhcp`; do
+       run_iptables -A `input_chain $interface` -p udp --dport 67:68 -j ACCEPT
+       run_iptables -A OUTPUT    -o $interface  -p udp --dport 67:68 -j ACCEPT
+    done
+
     ###########################################################################
     # RFC 1918
     #
@@ -3176,13 +3186,6 @@ define_firewall() # $1 = Command (Start or Restart)
 
     process_rules $rules
 
-    echo "Adding rules for DHCP"
-
-    for interface in `find_interfaces_by_option dhcp`; do
-	run_iptables -A `input_chain $interface` -p udp --dport 67:68 -j ACCEPT
-	run_iptables -A OUTPUT	  -o $interface	 -p udp --dport 67:68 -j ACCEPT
-    done
-
     echo "Setting up ICMP Echo handling..."
 
     filterping_interfaces="`find_interfaces_by_option filterping`"