From: Thomas Markwalder Date: Fri, 13 Jan 2017 12:05:23 +0000 (-0500) Subject: [5033] Removed no longer relevant enable-udpates false test X-Git-Tag: trac5112_base~6^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a79bacb0123804a7c628ec5968ac9a8eb5e7ec8;p=thirdparty%2Fkea.git [5033] Removed no longer relevant enable-udpates false test D2ClientConfigParser:parse() - removed the enable-updates false test as it is both irrelevant and broken (map size will never be 1) --- diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc index a3b7ae8ab1..93b5af4746 100644 --- a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc +++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc @@ -1264,14 +1264,6 @@ D2ClientConfigParser::parse(isc::data::ConstElementPtr client_config) { try { current_param = "enable-updates"; enable_updates = getBoolean(client_config, current_param); - if (!enable_updates && (client_config->mapValue().size() == 1)) { - // If enable-updates is the only parameter and it is false then - // we're done. This allows for an abbreviated configuration entry - // that only contains that flag. Use the default D2ClientConfig - // constructor to a create a disabled instance. - new_config.reset(new D2ClientConfig()); - return (new_config); - } current_param = "server-ip"; server_ip = IOAddress(getString(client_config, (current_param)));