summaryrefslogtreecommitdiffstats
path: root/src/bin/dhcp4/json_config_parser.cc
diff options
context:
space:
mode:
authorRazvan Becheriu <razvan@isc.org>2020-10-29 11:29:46 +0100
committerRazvan Becheriu <razvan@isc.org>2020-11-18 14:55:23 +0100
commit059642868aad5c4644be662f2e0664c6c08ad276 (patch)
tree5548c1a38a48017a21879ad251e87d71010be13c /src/bin/dhcp4/json_config_parser.cc
parent[#1405] regenerated tests (diff)
downloadkea-059642868aad5c4644be662f2e0664c6c08ad276.tar.xz
kea-059642868aad5c4644be662f2e0664c6c08ad276.zip
[#1405] updated comments
Diffstat (limited to 'src/bin/dhcp4/json_config_parser.cc')
-rw-r--r--src/bin/dhcp4/json_config_parser.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index 95a586705b..b5d54d17d6 100644
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -432,6 +432,14 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
// Apply global options in the staging config, e.g. ip-reservations-unique
global_parser.parseEarly(srv_cfg, mutable_cfg);
+ // If using deprecated reservation-mode, remove defaults for new parameters
+ // reservations-out-of-pool, reservations-in-subnet and reservations-global.
+ if (reservation_mode) {
+ mutable_cfg->remove("reservations-out-of-pool");
+ mutable_cfg->remove("reservations-in-subnet");
+ mutable_cfg->remove("reservations-global");
+ }
+
// We need definitions first
ConstElementPtr option_defs = mutable_cfg->get("option-def");
if (option_defs) {