From aff9d6ab2905f5e29295e07e3cd5e1a7c1d32b5c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 30 Aug 2005 01:56:13 +0000
Subject: Move DNS to pool area

---
 etc/inc/services.inc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 8659df9..a7dbf57 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -153,27 +153,27 @@ EOPP;
 			$dnscfg .= "	option domain-name \"{$dhcpifconf['domain']}\";\n";
 		}
 
+		if (is_array($dhcpifconf['dnsserver']) && ($dhcpifconf['dnsserver'][0])) {
+			$dnscfg .= "	option domain-name-servers " . join(",", $dhcpifconf['dnsserver']) . ";";
+		} else if (isset($config['dnsmasq']['enable'])) {
+			$dnscfg .= "	option domain-name-servers " . $ifcfg['ipaddr'] . ";";
+		} else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) {
+			$dnscfg .= "	option domain-name-servers " . join(",", $syscfg['dnsserver']) . ";";
+		}
+
+		$dhcpdconf .= "subnet $subnet netmask $subnetmask {\n";
+		$dhcpdconf .= "	pool {\n";
+
 		/* is failover dns setup? */
 		if (is_array($dhcpifconf['dnsserver']) && $dhcpifconf['dnsserver'][0] <> "") {
-			$dhcpdconf .= "	option domain-name-servers {$dhcpifconf['dnsserver'][0]}";
+			$dhcpdconf .= "		option domain-name-servers {$dhcpifconf['dnsserver'][0]}";
 			if($dhcpifconf['dnsserver'][1] <> "")
 				$dhcpdconf .= ",{$dhcpifconf['dnsserver'][1]}";
 			$dhcpdconf .= "\n";
-		} else {
-			if (is_array($dhcpifconf['dnsserver']) && ($dhcpifconf['dnsserver'][0])) {
-				$dnscfg .= "	option domain-name-servers " . join(",", $dhcpifconf['dnsserver']) . ";";
-			} else if (isset($config['dnsmasq']['enable'])) {
-				$dnscfg .= "	option domain-name-servers " . $ifcfg['ipaddr'] . ";";
-			} else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) {
-				$dnscfg .= "	option domain-name-servers " . join(",", $syscfg['dnsserver']) . ";";
-			}
 		}
-
-		$dhcpdconf .= "subnet $subnet netmask $subnetmask {\n";
-		$dhcpdconf .= "	pool {\n";
 		
 		if($dhcpifconf['failover_peerip'] <> "") 
-			$dhcpdconf .= "	deny dynamic bootp clients;\n";
+			$dhcpdconf .= "		deny dynamic bootp clients;\n";
 		
 		if (isset($dhcpifconf['denyunknown']))
 		   $dhcpdconf .= "		deny unknown clients;\n";
-- 
cgit v1.1