diff options
| author | Chris Buechler <cmb@pfsense.org> | 2014-11-28 16:09:10 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2014-11-28 16:09:10 -0600 |
| commit | f4620b36fdc29ed665776f50a01423c901a48411 (patch) | |
| tree | 3cebf9c0f9e0438f479ede0d7f643651ebeddeda /etc/inc/services.inc | |
| parent | b7960673bef61c323715da72d52e4aece5f1fd57 (diff) | |
| download | pfsense-f4620b36fdc29ed665776f50a01423c901a48411.zip pfsense-f4620b36fdc29ed665776f50a01423c901a48411.tar.gz | |
check if Unbound is enabled in addition to dnsmasq for v6 DNS assignment. Fixes #4051
Diffstat (limited to 'etc/inc/services.inc')
| -rw-r--r-- | etc/inc/services.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 72183c2..4d67445 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -186,7 +186,7 @@ function services_radvd_configure($blacklist = array()) { foreach($dhcpv6ifconf['radnsserver'] as $server) if (is_ipaddrv6($server)) $dnslist[] = $server; - } elseif (isset($config['dnsmasq']['enable'])) { + } elseif (isset($config['dnsmasq']['enable']) || isset($config['unbound']['enable'])) { $dnslist[] = get_interface_ipv6($realif); } elseif (is_array($config['system']['dnsserver']) && !empty($config['system']['dnsserver'])) { foreach($config['system']['dnsserver'] as $server) { @@ -259,7 +259,7 @@ function services_radvd_configure($blacklist = array()) { /* add DNS servers */ $dnslist = array(); - if (isset($config['dnsmasq']['enable'])) { + if (isset($config['dnsmasq']['enable']) || isset($config['unbound']['enable'])) { $dnslist[] = $ifcfgipv6; } elseif (is_array($config['system']['dnsserver']) && !empty($config['system']['dnsserver'])) { foreach($config['system']['dnsserver'] as $server) { @@ -1153,7 +1153,7 @@ EOD; if (is_array($dhcpv6ifconf['dnsserver']) && ($dhcpv6ifconf['dnsserver'][0])) { $dnscfgv6 .= " option dhcp6.name-servers " . join(",", $dhcpv6ifconf['dnsserver']) . ";"; - } else if ((isset($config['dnsmasq']['enable'])) && (is_ipaddrv6($ifcfgipv6))) { + } else if (((isset($config['dnsmasq']['enable'])) || isset($config['unbound']['enable'])) && (is_ipaddrv6($ifcfgipv6))) { $dnscfgv6 .= " option dhcp6.name-servers {$ifcfgipv6};"; } else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) { $dns_arrv6 = array(); |
