From 40955ddaee1960e885294d908a1098c8c1cbfaba Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 28 Sep 2023 17:42:24 +0200 Subject: [PATCH] dhcp: looks like a refactor gone wrong #6853 --- src/etc/inc/plugins.inc.d/dhcpd.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc index 17abde234..b414fc423 100644 --- a/src/etc/inc/plugins.inc.d/dhcpd.inc +++ b/src/etc/inc/plugins.inc.d/dhcpd.inc @@ -1363,7 +1363,9 @@ function dhcpd_dhcp6_configure($verbose = false, $blacklist = []) /* get config entry and marry it to the live prefix */ $dhcpdv6cfg[$ifname]['range']['from'] = merge_ipv6_address($ifcfgipv6, $dhcpdv6cfg[$ifname]['range']['from']); $dhcpdv6cfg[$ifname]['range']['to'] = merge_ipv6_address($ifcfgipv6, $dhcpdv6cfg[$ifname]['range']['to']); - } elseif (!empty($dhcpdv6cfg[$ifname]['prefixrange']['from']) && !empty($dhcpdv6cfg[$ifname]['prefixrange']['to'])) { + } + + if (!empty($dhcpdv6cfg[$ifname]['prefixrange']['from']) && !empty($dhcpdv6cfg[$ifname]['prefixrange']['to'])) { /* XXX $pdlen is never validated against prefixlenght setting, but must be smaller or equal */ $pdlen = 64 - calculate_ipv6_delegation_length($config['interfaces'][$ifname]['track6-interface']);