BIND 10 trac3358, updated. 250a2bb1b9216568f7a75adf8a7c0c90817937fa [3358] Addressed review comments.

[BIND 10 source code commits]

The branch, trac3358 has been updated
       via  250a2bb1b9216568f7a75adf8a7c0c90817937fa (commit)
      from  a8560aefbfaffd86f4c63b500c38ee4a1bd8f8de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 250a2bb1b9216568f7a75adf8a7c0c90817937fa
Author: Thomas Markwalder <tmark at isc.org>
Date:   Thu Mar 13 07:08:35 2014 -0400

    [3358] Addressed review comments.
    
    Added the constant D2ClientConfig::DFT_ALWAYS_INCLUDE_FQDN

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dhcpsrv/d2_client_cfg.cc               |    1 +
 src/lib/dhcpsrv/d2_client_cfg.h                |    1 +
 src/lib/dhcpsrv/dhcp_parsers.cc                |    4 +++-
 src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc |    2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcpsrv/d2_client_cfg.cc b/src/lib/dhcpsrv/d2_client_cfg.cc
index 5e42555..087f052 100644
--- a/src/lib/dhcpsrv/d2_client_cfg.cc
+++ b/src/lib/dhcpsrv/d2_client_cfg.cc
@@ -27,6 +27,7 @@ const char *D2ClientConfig::DFT_SERVER_IP = "127.0.0.1";
 const size_t D2ClientConfig::DFT_SERVER_PORT = 53001;
 const char *D2ClientConfig::DFT_NCR_PROTOCOL = "UDP";
 const char *D2ClientConfig::DFT_NCR_FORMAT = "JSON";
+const bool D2ClientConfig::DFT_ALWAYS_INCLUDE_FQDN = false;
 const bool D2ClientConfig::DFT_OVERRIDE_NO_UPDATE = false;
 const bool D2ClientConfig::DFT_OVERRIDE_CLIENT_UPDATE = false;
 const bool D2ClientConfig::DFT_REPLACE_CLIENT_NAME = false;
diff --git a/src/lib/dhcpsrv/d2_client_cfg.h b/src/lib/dhcpsrv/d2_client_cfg.h
index ab668c4..eb86d30 100644
--- a/src/lib/dhcpsrv/d2_client_cfg.h
+++ b/src/lib/dhcpsrv/d2_client_cfg.h
@@ -64,6 +64,7 @@ public:
     static const size_t DFT_SERVER_PORT;
     static const char *DFT_NCR_PROTOCOL;
     static const char *DFT_NCR_FORMAT;
+    static const bool DFT_ALWAYS_INCLUDE_FQDN;
     static const bool DFT_OVERRIDE_NO_UPDATE;
     static const bool DFT_OVERRIDE_CLIENT_UPDATE;
     static const bool DFT_REPLACE_CLIENT_NAME;
diff --git a/src/lib/dhcpsrv/dhcp_parsers.cc b/src/lib/dhcpsrv/dhcp_parsers.cc
index 5d307fb..5265ff5 100644
--- a/src/lib/dhcpsrv/dhcp_parsers.cc
+++ b/src/lib/dhcpsrv/dhcp_parsers.cc
@@ -1301,7 +1301,9 @@ D2ClientConfigParser::build(isc::data::ConstElementPtr client_config) {
                                                      DFT_QUALIFYING_SUFFIX);
 
     bool always_include_fqdn = boolean_values_->
-                               getOptionalParam("always-include-fqdn", false);
+                               getOptionalParam("always-include-fqdn",
+                                               D2ClientConfig::
+                                               DFT_ALWAYS_INCLUDE_FQDN);
 
     bool override_no_update = boolean_values_->
                               getOptionalParam("override-no-update",
diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
index d99ab8c..fb4f683 100644
--- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
@@ -853,6 +853,8 @@ TEST_F(ParseConfigTest, parserDefaultsD2Config) {
               d2_client_config->getNcrProtocol());
     EXPECT_EQ(dhcp_ddns::stringToNcrFormat(D2ClientConfig::DFT_NCR_FORMAT),
               d2_client_config->getNcrFormat());
+    EXPECT_EQ(D2ClientConfig::DFT_ALWAYS_INCLUDE_FQDN,
+              d2_client_config->getAlwaysIncludeFqdn());
     EXPECT_EQ(D2ClientConfig::DFT_OVERRIDE_NO_UPDATE,
               d2_client_config->getOverrideNoUpdate());
     EXPECT_EQ(D2ClientConfig::DFT_OVERRIDE_CLIENT_UPDATE,