mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[5145b] get rid of D2ClientConfig::isShortCutDisabled

Browse Source
This commit is contained in:
Francis Dupont
2017-03-04 16:49:24 +01:00
parent 708a616ecd
commit 3f2ee8d6da
5 changed files with 34 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/dhcp4/json_config_parser.cc
View File

@@ -520,10 +520,8 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set,
// Legacy DhcpConfigParser stuff below
if (config_pair.first == "dhcp-ddns") {
// Apply defaults if not in short cut
if (!D2ClientConfigParser::isShortCutDisabled(config_pair.second)) {
D2ClientConfigParser::setAllDefaults(config_pair.second);
}
// Apply defaults
D2ClientConfigParser::setAllDefaults(config_pair.second);
D2ClientConfigParser parser;
D2ClientConfigPtr cfg = parser.parse(config_pair.second);
srv_cfg->setD2ClientConfig(cfg);