[master] Merge branch 'trac3874a'

diff --cc doc/guide/dhcp6-srv.xml
Simple merge

diff --cc src/bin/dhcp6/dhcp6.spec
Simple merge

diff --cc src/bin/dhcp6/dhcp6_messages.mes
Simple merge

diff --cc src/bin/dhcp6/dhcp6_srv.cc
Simple merge

diff --cc src/bin/dhcp6/dhcp6_srv.h
Simple merge

diff --cc src/bin/dhcp6/json_config_parser.cc
index fe0af1831132a2c67be34427346ca893c47bc734,d65428a750b61652ca707540de4587aba26bcede..5fb4b2cba07c8cd229160594c3eca63d90617904
--- 1/src/bin/dhcp6/json_config_parser.cc
--- 2/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@@ -702,8 -702,8 +703,10 @@@ DhcpConfigParser* createGlobal6DhcpConf
          parser = new ControlSocketParser(config_id);
      } else if (config_id.compare("expired-leases-processing") == 0) {
          parser = new ExpirationConfigParser();
 +    } else if (config_id.compare("client-classes") == 0) {
 +        parser = new ClientClassDefListParser(config_id, globalContext());
+     } else if (config_id.compare("server-id") == 0) {
+         parser = new DUIDConfigParser();
      } else {
          isc_throw(DhcpConfigError,
                  "unsupported global configuration parameter: "

diff --cc src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
Simple merge

diff --cc src/lib/dhcpsrv/Makefile.am
Simple merge

diff --cc src/lib/dhcpsrv/srv_config.cc
index 8f8b793eefad686022135e019853bee9652a64cf,912459fb421e0114a181cc031c5584e90566ec42..67b9d31086c5cd86484427cf5b6218842e7265b0
--- 1/src/lib/dhcpsrv/srv_config.cc
--- 2/src/lib/dhcpsrv/srv_config.cc
+++ b/src/lib/dhcpsrv/srv_config.cc
@@@ -31,8 -31,7 +31,8 @@@ SrvConfig::SrvConfig(
        cfg_option_def_(new CfgOptionDef()), cfg_option_(new CfgOption()),
        cfg_subnets4_(new CfgSubnets4()), cfg_subnets6_(new CfgSubnets6()),
        cfg_hosts_(new CfgHosts()), cfg_rsoo_(new CfgRSOO()),
-       cfg_expiration_(new CfgExpiration()),
+       cfg_expiration_(new CfgExpiration()), cfg_duid_(new CfgDUID()),
 +      class_dictionary_(new ClientClassDictionary()),
        decline_timer_(0) {
  }
  
@@@ -41,8 -40,7 +41,8 @@@ SrvConfig::SrvConfig(const uint32_t seq
        cfg_option_def_(new CfgOptionDef()), cfg_option_(new CfgOption()),
        cfg_subnets4_(new CfgSubnets4()), cfg_subnets6_(new CfgSubnets6()),
        cfg_hosts_(new CfgHosts()), cfg_rsoo_(new CfgRSOO()),
-       cfg_expiration_(new CfgExpiration()),
+       cfg_expiration_(new CfgExpiration()), cfg_duid_(new CfgDUID()),
 +      class_dictionary_(new ClientClassDictionary()),
        decline_timer_(0) {
  }
  

diff --cc src/lib/dhcpsrv/srv_config.h
Simple merge

diff --cc src/lib/dhcpsrv/tests/Makefile.am
Simple merge