From fd979aa2c29d252beffb27b51e03ba2bd16df9b2 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sun, 1 Dec 2019 15:34:44 +0100 Subject: [PATCH] Dhcpdv6/radv. both services_dhcpv6.php and services_router_advertisements.php share the same config section, leading to empty values after safe. for https://github.com/opnsense/core/issues/3834 --- src/www/services_dhcpv6.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php index e4aaa134e..4cfbc0989 100644 --- a/src/www/services_dhcpv6.php +++ b/src/www/services_dhcpv6.php @@ -282,7 +282,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } // router advertisement data lives in the same spot, copy foreach (array_keys($config['dhcpdv6'][$if]) as $fieldname) { - if (substr($fieldname,0 ,2) == 'ra' && !in_array($fieldname, array_keys($dhcpdconf))) { + if ((substr($fieldname,0 ,2) == 'ra' || substr($fieldname,0 ,3) == 'Adv') && !in_array($fieldname, array_keys($dhcpdconf))) { $dhcpdconf[$fieldname] = $config['dhcpdv6'][$if][$fieldname]; } }