From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 26 Nov 2015 15:22:32 +0000 (+0100)
Subject: [master] Merge branch 'trac3874a'
X-Git-Tag: trac4231_base~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faf52b069cf774d0050d76b4f47b542b2b5105f2;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3874a'
---

faf52b069cf774d0050d76b4f47b542b2b5105f2
diff --cc src/bin/dhcp6/json_config_parser.cc
index fe0af18311,d65428a750..5fb4b2cba0
--- a/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/lib/dhcpsrv/srv_config.cc
index 8f8b793eef,912459fb42..67b9d31086
--- a/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) {
  }