diff options
| author | Phil Davis <phil.davis@world.inf.org> | 2014-02-24 19:40:30 -0800 |
|---|---|---|
| committer | Phil Davis <phil.davis@world.inf.org> | 2014-02-24 19:40:30 -0800 |
| commit | 3ad6b569d64043a75bbb63453658ed005e89ef2c (patch) | |
| tree | 05866b6b446a4ede269fd59cf49348f14a166a4e /etc/inc/services.inc | |
| parent | 04f5393f49be48989cb6e073a51bd35b33f177a1 (diff) | |
| download | pfsense-3ad6b569d64043a75bbb63453658ed005e89ef2c.zip pfsense-3ad6b569d64043a75bbb63453658ed005e89ef2c.tar.gz | |
Fix #3483 only use IPv4 DNS servers in DHCP v4 conf
Diffstat (limited to 'etc/inc/services.inc')
| -rw-r--r-- | etc/inc/services.inc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index c341574..d92b0ef 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -386,6 +386,14 @@ function services_dhcpdv4_configure() { $dhcpdcfg = $config['dhcpd']; $Iflist = get_configured_interface_list(); + /* Only consider DNS servers with IPv4 addresses for the IPv4 DHCP server. */ + $dns_arrv4 = array(); + foreach($syscfg['dnsserver'] as $dnsserver) { + if (is_ipaddrv4($dnsserver)) { + $dns_arrv4[] = $dnsserver; + } + } + if ($g['booting']) echo gettext("Starting DHCP service..."); else @@ -565,10 +573,10 @@ EOPP; $dnscfg .= " option domain-name-servers {$ifcfgip};"; if ($newzone['domain-name'] && is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) $newzone['dns-servers'] = $syscfg['dnsserver']; - } else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) { - $dnscfg .= " option domain-name-servers " . join(",", $syscfg['dnsserver']) . ";"; + } else if (!empty($dns_arrv4)) { + $dnscfg .= " option domain-name-servers " . join(",", $dns_arrv4) . ";"; if ($newzone['domain-name']) - $newzone['dns-servers'] = $syscfg['dnsserver']; + $newzone['dns-servers'] = $dns_arrv4; } /* Create classes - These all contain comma separated lists. Join them into one |
