diff options
author | Ermal Luçi <eri@pfsense.org> | 2013-11-07 10:34:36 -0800 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2013-11-07 10:34:36 -0800 |
commit | 215319ceb0027d0f22da0dc736b478047b29820f (patch) | |
tree | 1cacf35ddca346d4d2ceda40092e27725dd4c0d1 | |
parent | 96a60eb4299aa164b2d3db2eb463e03e841673d0 (diff) | |
parent | 91d647b42081b80a2d38fdf578d20826f66cdfa6 (diff) | |
download | pfsense-215319ceb0027d0f22da0dc736b478047b29820f.zip pfsense-215319ceb0027d0f22da0dc736b478047b29820f.tar.gz |
Merge pull request #846 from jean-m-cyr/RELENG_2_1
Give clients the IPV6 address of the DNS server
-rw-r--r-- | etc/inc/services.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 623040e..012ee71 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -980,6 +980,7 @@ function services_dhcpdv6_configure() { $dhcpdv6cfg[$ifname]['prefixrange']['from'] = Net_IPv6::compress($range['start']); $dhcpdv6cfg[$ifname]['prefixrange']['to'] = Net_IPv6::compress($range['end']); + $dhcpdv6cfg[$ifname]['dns6ip'] = get_interface_ipv6($ifname); } } } @@ -1085,6 +1086,9 @@ EOD; if (is_ipaddrv6($dhcpv6ifconf['prefixrange']['from']) && is_ipaddrv6($dhcpv6ifconf['prefixrange']['to'])) { $dhcpdv6conf .= " prefix6 {$dhcpv6ifconf['prefixrange']['from']} {$dhcpv6ifconf['prefixrange']['to']}/{$dhcpv6ifconf['prefixrange']['prefixlength']};\n"; } + if (is_ipaddrv6($dhcpv6ifconf['dns6ip'])) { + $dhcpdv6conf .= " option dhcp6.name-servers {$dhcpv6ifconf['dns6ip']};\n"; + } // default-lease-time if ($dhcpv6ifconf['defaultleasetime']) $dhcpdv6conf .= " default-lease-time {$dhcpv6ifconf['defaultleasetime']};\n"; |