BIND 10 trac3210, updated. 88a4858db206dfcd53a227562198f308f7779a72 [3210] Changes after review:

[BIND 10 source code commits]

The branch, trac3210 has been updated
       via  88a4858db206dfcd53a227562198f308f7779a72 (commit)
      from  689bd411d1c25b3bd798a24567cadf4f867475c8 (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 88a4858db206dfcd53a227562198f308f7779a72
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Dec 16 18:28:42 2013 +0100

    [3210] Changes after review:
    
     - flag => configuration parameter
     - echoClientId test uses ASSERTs rather than EXPECTs

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

Summary of changes:
 ChangeLog                                     |    5 +++--
 doc/guide/bind10-guide.xml                    |    4 ++--
 src/bin/dhcp4/tests/config_parser_unittest.cc |    6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index bdd67a2..0e8ec96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 XXX.	[func]		tomek
 	b10-dhcp4: Support for sending back client-id (RFC6842) has been
-	added now. Also a flag (echo-client-id) has been added, so it is
-	possible to enable backward compatibility (echo-client-id false).
+	added now. Also a configuration parameter (echo-client-id) has
+	been added, so it is possible to enable backward compatibility
+	("echo-client-id false").
 	(Trac #3210, git abcd)
 
 698.	[bug]		muks
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 1e68380..d6bfc99 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -4426,8 +4426,8 @@ Dhcp4/subnet4	[]	list	(default)
       that Kea offers. However, in some cases older devices that do
       not support RFC6842 may refuse to accept responses that include
       client-id option. To enable backward compatibility, an optional
-      flag has been introduced. To configure it, use the following
-      commands:</para>
+      configuration parameter has been introduced. To configure it,
+      use the following commands:</para>
 
 <screen>
 > <userinput>config add Dhcp4/echo-client-id</userinput>
diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index 1aace13..cbff737 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -583,15 +583,15 @@ TEST_F(Dhcp4ParserTest, echoClientId) {
     ElementPtr json_true = Element::fromJSON(config_true);
 
     // Let's check the default. It should be true
-    EXPECT_TRUE(CfgMgr::instance().echoClientId());
+    ASSERT_TRUE(CfgMgr::instance().echoClientId());
 
     // Now check that "false" configuration is really applied.
     EXPECT_NO_THROW(status = configureDhcp4Server(*srv_, json_false));
-    EXPECT_FALSE(CfgMgr::instance().echoClientId());
+    ASSERT_FALSE(CfgMgr::instance().echoClientId());
 
     // Now check that "true" configuration is really applied.
     EXPECT_NO_THROW(status = configureDhcp4Server(*srv_, json_true));
-    EXPECT_TRUE(CfgMgr::instance().echoClientId());
+    ASSERT_TRUE(CfgMgr::instance().echoClientId());
 
     // In any case revert back to the default value (true)
     CfgMgr::instance().echoClientId(true);