From 07efe7c0ebe6a2b434efdbb41acd506db0e2bd48 Mon Sep 17 00:00:00 2001 From: Daniel Becker Date: Mon, 9 Feb 2015 01:28:28 -0800 Subject: [PATCH] add dhcp6.name-servers option with DHCPD-PD regardless of PD length The existing code only includes a v6 name server IP in the automatically generated dhcpdv6 configuration for tracking interfaces if there are additional prefixes that can be delegated on to the next router (i.e., if PD length > 2). The correct behavior is for this option to be included regardless of the PD length, as implemented in this change. --- etc/inc/services.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 7156126ecf..d1ac83003d 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -1091,8 +1091,8 @@ function services_dhcpdv6_configure($blacklist = array()) { $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); } + $dhcpdv6cfg[$ifname]['dns6ip'] = get_interface_ipv6($ifname); } } @@ -1210,7 +1210,7 @@ EOD; $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"; + $dhcpdv6conf .= " option dhcp6.name-servers {$dhcpv6ifconf['dns6ip']};\n"; } // default-lease-time if ($dhcpv6ifconf['defaultleasetime'])