mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3483 only use IPv4 DNS servers in DHCP v4 conf

Browse Source
This commit is contained in:
Phil Davis 2014-02-24 19:40:30 -08:00
parent 04f5393f49
commit 3ad6b569d6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/inc/services.inc
View File

@ -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