summaryrefslogtreecommitdiffstats
path: root/etc/inc/services.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-08-30 01:56:13 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-08-30 01:56:13 +0000
commitaff9d6ab2905f5e29295e07e3cd5e1a7c1d32b5c (patch)
tree981e6474aa89fc2820b0571437d2ecd480d02615 /etc/inc/services.inc
parent9e2a4fcefad0e1cb4a74de6b8f8240a6f4d3e737 (diff)
downloadpfsense-aff9d6ab2905f5e29295e07e3cd5e1a7c1d32b5c.zip
pfsense-aff9d6ab2905f5e29295e07e3cd5e1a7c1d32b5c.tar.gz
Move DNS to pool area
Diffstat (limited to 'etc/inc/services.inc')
-rw-r--r--etc/inc/services.inc26
1 files 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";
OpenPOWER on IntegriCloud