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

add dhcp6.name-servers option with DHCPD-PD regardless of PD length

Browse Source 
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.
This commit is contained in:
Daniel Becker 2015-02-09 01:28:28 -08:00 committed by Renato Botelho
parent 76feb40735
commit 07efe7c0eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/inc/services.inc
View File

@ -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'])