From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 6 Jan 2017 23:51:39 +0000 (+0100)
Subject: [master] Merge branch 'trac5030'
X-Git-Tag: trac5035_base
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b55841b6a476564a5084ba4e51366fdae9e19f78;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5030'
---

b55841b6a476564a5084ba4e51366fdae9e19f78
diff --cc src/bin/dhcp6/json_config_parser.cc
index 914fbee53d,b14d7c8c77..bea936afde
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@@ -907,20 -909,12 +905,26 @@@ configureDhcp6Server(Dhcpv6Srv&, isc::d
                  continue;
              }
  
 +            if (config_pair.first == "mac-sources") {
 +                MACSourcesListConfigParser parser;
 +                CfgMACSource& mac_source = CfgMgr::instance().getStagingCfg()->getMACSources();
 +                parser.parse(mac_source, config_pair.second);
 +                continue;
 +            }
 +
 +            if (config_pair.first == "control-socket") {
 +                ControlSocketParser parser;
 +                SrvConfigPtr srv_config = CfgMgr::instance().getStagingCfg();
 +                parser.parse(*srv_config, config_pair.second);
 +                continue;
 +            }
 +
+             if (config_pair.first == "host-reservation-identifiers") {
+                 HostReservationIdsParser6 parser;
+                 parser.parse(config_pair.second);
+                 continue;
+             }
+ 
              ParserPtr parser(createGlobal6DhcpConfigParser(config_pair.first,
                                                             config_pair.second));
              LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL, DHCP6_PARSER_CREATED)