From: Razvan Becheriu <razvan@isc.org>
Date: Sat, 7 Nov 2020 22:07:22 +0000 (+0200)
Subject: [#1375] destroy lease manager if type is not memfile
X-Git-Tag: Kea-1.9.3~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42556b0723bdb6dd771f442ed5dbc7f8de3deb5e;p=thirdparty%2Fkea.git

[#1375] destroy lease manager if type is not memfile
---

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index c729cb4b17..48cdcd85b0 100644
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -345,7 +345,7 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
         // manager and an empty host manager will be created instead.
         auto running_cfg = CfgMgr::instance().getCurrentCfg();
         auto parameters = DatabaseConnection::parse(running_cfg->getCfgDbAccess()->getLeaseDbAccessString());
-        if (parameters["type"] == "mysql" || parameters["type"] == "postgresql") {
+        if (parameters["type"] != "memfile") {
             CfgDbAccess cfg_db;
             cfg_db.setAppendedParameters("universe=4");
             LeaseMgrFactory::create(cfg_db.getLeaseDbAccessString());
diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 3d28f9b534..7022aeda86 100644
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -448,7 +448,7 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
         // manager and an empty host manager will be created instead.
         auto running_cfg = CfgMgr::instance().getCurrentCfg();
         auto parameters = DatabaseConnection::parse(running_cfg->getCfgDbAccess()->getLeaseDbAccessString());
-        if (parameters["type"] == "mysql" || parameters["type"] == "postgresql") {
+        if (parameters["type"] != "memfile") {
             CfgDbAccess cfg_db;
             cfg_db.setAppendedParameters("universe=6");
             LeaseMgrFactory::create(cfg_db.getLeaseDbAccessString());