From: Marcin Siodelski Date: Tue, 17 Mar 2015 11:34:28 +0000 (+0100) Subject: [3744] Minor comments update in the JSON parsers. X-Git-Tag: kea-0.9.1~23^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81b5979918d5c000f01cef311ad5ca5b501b0e48;p=thirdparty%2Fkea.git [3744] Minor comments update in the JSON parsers. --- diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc index 30b070a632..f127c16307 100644 --- a/src/bin/dhcp4/json_config_parser.cc +++ b/src/bin/dhcp4/json_config_parser.cc @@ -416,6 +416,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) { // Thus we group parsers and will fire them in the right order: // all parsers other than: lease-database, subnet4 and option-data parser, // then: option-data parser, subnet4 parser, lease-database parser. + // Please do not change this order! ParserCollection independent_parsers; ParserPtr subnet_parser; ParserPtr option_parser; diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc index 315de5d08c..8e5a6ddaf2 100644 --- a/src/bin/dhcp6/json_config_parser.cc +++ b/src/bin/dhcp6/json_config_parser.cc @@ -626,8 +626,10 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) { // depend on the global values. Also, option values configuration // must be performed after the option definitions configurations. // Thus we group parsers and will fire them in the right order: - // all parsers other than subnet6 and option-data parser, - // option-data parser, subnet6 parser. + // all parsers other than lease-database, subnet6 and + // option-data parser, then option-data parser, subnet6 parser, + // lease-database parser. + // Please do not change this order! ParserCollection independent_parsers; ParserPtr subnet_parser; ParserPtr option_parser;