diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-08-30 02:14:39 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-08-30 02:14:39 +0000 |
| commit | f8e7ad3f46f9f4e057b538f44d507ebe1b5fa6cd (patch) | |
| tree | c96e4ef29776f8a33ff2fb42fbc8f4fd8a7946a9 | |
| parent | aff9d6ab2905f5e29295e07e3cd5e1a7c1d32b5c (diff) | |
| download | pfsense-f8e7ad3f46f9f4e057b538f44d507ebe1b5fa6cd.zip pfsense-f8e7ad3f46f9f4e057b538f44d507ebe1b5fa6cd.tar.gz | |
Move DNS to pool area
| -rw-r--r-- | etc/inc/services.inc | 2 | ||||
| -rwxr-xr-x | usr/local/www/services_dhcp.php | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index a7dbf57..fca7a4f 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -154,7 +154,7 @@ EOPP; } if (is_array($dhcpifconf['dnsserver']) && ($dhcpifconf['dnsserver'][0])) { - $dnscfg .= " option domain-name-servers " . join(",", $dhcpifconf['dnsserver']) . ";"; + //$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])) { diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 6f8922d..1c3fcbf 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -151,10 +151,13 @@ if ($_POST) { if ($_POST['wins2']) $config['dhcpd'][$if]['winsserver'][] = $_POST['wins2']; - if ($_POST['dns1']) + if ($_POST['dns1']) { + unset($config['dhcpd'][$if]['dnsserver']); $config['dhcpd'][$if]['dnsserver'][] = $_POST['dns1']; - if ($_POST['dns2']) + } + if ($_POST['dns2']) { $config['dhcpd'][$if]['dnsserver'][] = $_POST['dns2']; + } $config['dhcpd'][$if]['gateway'] = $_POST['gateway']; |
