From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 26 Jan 2017 13:26:16 +0000 (+0100)
Subject: [5019_rebase] Fix after rebase.
X-Git-Tag: trac3389_base~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=737a7959b4552e78d9e62c2acc6875dc252fcfaf;p=thirdparty%2Fkea.git

[5019_rebase] Fix after rebase.
---

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index bf206bea45..4eba354900 100644
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -740,15 +740,6 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
         // Setup the command channel.
         configureCommandChannel();
 
-        // the leases database parser is the last to be run.
-        std::map<std::string, ConstElementPtr>::const_iterator leases_config =
-            values_map.find("lease-database");
-        if (leases_config != values_map.end()) {
-            config_pair.first = "lease-database";
-            leases_parser->build(leases_config->second);
-            leases_parser->commit();
-        }
-
         // Apply global options in the staging config.
         Dhcp4ConfigParser global_parser;
         global_parser.parse(mutable_cfg);