From d20c0fbccec200b449cc1f4c5fe7542d1a4b7964 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 5 Sep 2018 00:20:26 +0200 Subject: [PATCH] dhcpv6: enabled if auto track (pd doesn't matter) --- src/etc/inc/services.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 56b49d1e4..ad66788c6 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -1038,11 +1038,8 @@ function is_dhcpv6_server_enabled() global $config; foreach (legacy_config_get_interfaces(array('virtual' => false)) as $ifcfg) { - if (isset($ifcfg['enable']) && !empty($ifcfg['track6-interface'])) { - $pdlen = calculate_ipv6_delegation_length($ifcfg['track6-interface']); - if ($pdlen > 2) { - return true; - } + if (isset($ifcfg['enable']) && !empty($ifcfg['track6-interface']) && !isset($ifcfg['dhcpd6track6allowoverride'])) { + return true; } }