diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-03-25 09:33:40 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-03-25 09:33:40 -0300 |
| commit | 3d73a44d84accdb2f70abf705aed9b3858292317 (patch) | |
| tree | 6ab9747d693fc8afb86dd379b9e7f7fcb094fb51 /etc/inc/services.inc | |
| parent | aa95e7daea28dfefe7551f0d2fa744de49e100b1 (diff) | |
| download | pfsense-3d73a44d84accdb2f70abf705aed9b3858292317.zip pfsense-3d73a44d84accdb2f70abf705aed9b3858292317.tar.gz | |
Use configured dns servers on radvd.conf, fixes #2905
Diffstat (limited to 'etc/inc/services.inc')
| -rw-r--r-- | etc/inc/services.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index d21de57..de18dc4 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -177,11 +177,14 @@ function services_radvd_configure() { /* add DNS servers */ $dnslist = array(); - if (is_array($dhcpv6ifconf['dnsserver']) && !empty($dhcpv6ifconf['dnsserver'])) { - foreach($dhcpv6ifconf['dnsserver'] as $server) { - if(is_ipaddrv6($server)) + if (isset($dhcpv6ifconf['rasamednsasdhcp6']) && is_array($dhcpv6ifconf['dnsserver']) && !empty($dhcpv6ifconf['dnsserver'])) { + foreach($dhcpv6ifconf['dnsserver'] as $server) + if (is_ipaddrv6($server)) + $dnslist[] = $server; + } elseif (!isset($dhcpv6ifconf['rasamednsasdhcp6']) && isset($dhcpv6ifconf['radnsserver']) && is_array($dhcpv6ifconf['radnsserver'])) { + foreach($dhcpv6ifconf['radnsserver'] as $server) + if (is_ipaddrv6($server)) $dnslist[] = $server; - } } elseif (isset($config['dnsmasq']['enable'])) { $dnslist[] = get_interface_ipv6($realif); } elseif (is_array($config['system']['dnsserver']) && !empty($config['system']['dnsserver'])) { |
