From: Francis Dupont <fdupont@isc.org>
Date: Mon, 31 Jul 2017 12:08:32 +0000 (+0200)
Subject: [master] Finished merge of trac5126 (flat style)
X-Git-Tag: trac5124a_base~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63e8df70f168b9abb020e35f8e604fc949d34f89;p=thirdparty%2Fkea.git

[master] Finished merge of trac5126 (flat style)
---

63e8df70f168b9abb020e35f8e604fc949d34f89
diff --cc src/lib/dhcpsrv/parsers/client_class_def_parser.cc
index 97a434ac3d,0180371958..b07b1bf2a3
--- a/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
+++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
@@@ -145,10 -141,10 +143,10 @@@ ClientClassDefParser::parse(ClientClass
  
      // Add the client class definition
      try {
 -        class_dictionary->addClass(name, match_expr, options, next_server,
 -                                   sname, filename);
 +        class_dictionary->addClass(name, match_expr, test, options,
 +                                   next_server, sname, filename);
      } catch (const std::exception& ex) {
-         isc_throw(DhcpConfigError, ex.what()
+         isc_throw(DhcpConfigError, "Can't add class: " << ex.what()
                    << " (" << class_def_cfg->getPosition() << ")");
      }
  }