[master] Merge branch 'trac3259'

diff --cc doc/Makefile.am
index 5e31b591dea16e046b3cc2148b9f2bff4e48753f,b98f1e3fb2734f8db09c8d21b408254ddf2f5932..4fdea2ddae7c179f57ff0cc30bfaaa702f06c0ad
--- 1/doc/Makefile.am
--- 2/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -8,20 -8,20 +8,22 @@@ EXTRA_DIST += devel/qa.do
  
  EXTRA_DIST += images/isc-logo.png
  
- nobase_dist_doc_DATA  = examples/kea4/single-subnet.json
- nobase_dist_doc_DATA += examples/kea4/several-subnets.json
+ nobase_dist_doc_DATA  = examples/ddns/sample1.json
+ nobase_dist_doc_DATA += examples/ddns/template.json
+ nobase_dist_doc_DATA += examples/kea4/hooks.json
++nobase_dist_doc_DATA += examples/kea4/leases-expiration.json
  nobase_dist_doc_DATA += examples/kea4/multiple-options.json
  nobase_dist_doc_DATA += examples/kea4/reservations.json
- nobase_dist_doc_DATA += examples/kea4/leases-expiration.json
- nobase_dist_doc_DATA += examples/kea6/simple.json
- nobase_dist_doc_DATA += examples/kea6/several-subnets.json
- nobase_dist_doc_DATA += examples/kea6/multiple-options.json
+ nobase_dist_doc_DATA += examples/kea4/several-subnets.json
+ nobase_dist_doc_DATA += examples/kea4/single-subnet.json
  nobase_dist_doc_DATA += examples/kea6/advanced.json
- nobase_dist_doc_DATA += examples/kea6/stateless.json
- nobase_dist_doc_DATA += examples/kea6/reservations.json
+ nobase_dist_doc_DATA += examples/kea6/hooks.json
 +nobase_dist_doc_DATA += examples/kea6/leases-expiration.json
- nobase_dist_doc_DATA += examples/ddns/sample1.json
- nobase_dist_doc_DATA += examples/ddns/template.json
+ nobase_dist_doc_DATA += examples/kea6/multiple-options.json
+ nobase_dist_doc_DATA += examples/kea6/reservations.json
+ nobase_dist_doc_DATA += examples/kea6/several-subnets.json
+ nobase_dist_doc_DATA += examples/kea6/simple.json
+ nobase_dist_doc_DATA += examples/kea6/stateless.json
  
  devel:
        mkdir -p html

diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc
Simple merge

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

diff --cc src/lib/dhcpsrv/parsers/dhcp_parsers.cc
Simple merge

diff --cc src/lib/dhcpsrv/parsers/dhcp_parsers.h
Simple merge

diff --cc src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
index 1806f58269356cb93ccacceeafe42cc0a9540051,008c32e5398ae8eb1474c6f0d8a625c628be27ca..39be6dd50eb766aeb4e5d18ac69ee8500adf9d13
--- 1/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
--- 2/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
@@@ -913,33 -822,14 +913,32 @@@ TEST_F(ParseConfigTest, optionDataMinim
  
  }
  
- };  // Anonymous namespace
- 
 +// This test verifies an empty option data configuration is supported.
 +TEST_F(ParseConfigTest, emptyOptionData) {
 +    // Configuration string.
 +    const std::string config =
 +        "{ \"option-data\": [ {"
 +        "    \"name\": \"dhcp4o6-server-addr\""
 +        " } ]"
 +        "}";
 +
 +    int rcode = 0;
 +    ASSERT_NO_THROW(rcode = parseConfiguration(config));
 +    EXPECT_EQ(0, rcode);
 +    const Option6AddrLstPtr opt = boost::dynamic_pointer_cast<
 +        Option6AddrLst>(getOptionPtr("dhcp6", D6O_DHCPV4_O_DHCPV6_SERVER));
 +    ASSERT_TRUE(opt);
 +    ASSERT_EQ(0, opt->getAddresses().size());
 +}
 +
  /// The next set of tests check basic operation of the HooksLibrariesParser.
- 
- 
- // Utility function for setting up the "hooks-libraries" configuration.
  //
- // Returns a hooks-libraries configuration element that contains zero to
- // three libraries, depending on what arguments are supplied.
+ // Convenience function to set a configuration of zero or more hooks
+ // libraries:
+ //
+ // lib1 - No parameters
+ // lib2 - Empty parameters statement
+ // lib3 - Valid parameters
  std::string
  setHooksLibrariesConfig(const char* lib1 = NULL, const char* lib2 = NULL,
                          const char* lib3 = NULL) {
@@@ -2065,3 -2050,3 +2157,5 @@@ TEST_F(ParseConfigTest, validRelayInfo6
  // There's no test for ControlSocketParser, as it is tested in the DHCPv4 code
  // (see CtrlDhcpv4SrvTest.commandSocketBasic in
  // src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc).
++
++};  // Anonymous namespace