From: Francis Dupont <fdupont@isc.org>
Date: Wed, 7 Dec 2022 17:09:50 +0000 (+0100)
Subject: [#2672] Changed to call setAppendedParameters once
X-Git-Tag: Kea-2.3.4~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da2c7ba4ba494e442d9d09759592aba59adaf4c;p=thirdparty%2Fkea.git

[#2672] Changed to call setAppendedParameters once
---

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index f94458b436..75256ced87 100644
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -917,10 +917,11 @@ ControlledDhcpv4Srv::processConfig(isc::data::ConstElementPtr config) {
             std::bind(&ControlledDhcpv4Srv::dbFailedCallback, srv, ph::_1);
 
         CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
-        cfg_db->setAppendedParameters("universe=4");
+        string params = "universe=4";
         if (cfg_db->getExtendedInfoTablesEnabled()) {
-            cfg_db->setAppendedParameters("extended-info-tables=true");
+            params += " extended-info-tables=true";
         }
+        cfg_db->setAppendedParameters(params);
         cfg_db->createManagers();
         // Reset counters related to connections as all managers have been recreated.
         srv->getNetworkState()->reset(NetworkState::Origin::DB_CONNECTION);
diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 59397692d3..67cf64d62e 100644
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -921,10 +921,11 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) {
             std::bind(&ControlledDhcpv6Srv::dbFailedCallback, srv, ph::_1);
 
         CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
-        cfg_db->setAppendedParameters("universe=6");
+        string params = "universe=6";
         if (cfg_db->getExtendedInfoTablesEnabled()) {
-            cfg_db->setAppendedParameters("extended-info-tables=true");
+            params += " extended-info-tables=true";
         }
+        cfg_db->setAppendedParameters(params);
         cfg_db->createManagers();
         // Reset counters related to connections as all managers have been recreated.
         srv->getNetworkState()->reset(NetworkState::Origin::DB_CONNECTION);