BIND 10 trac1004, updated. d57f30ffe93b7f45aa6492ea1fba5d594adc01df [trac1004] typo

[BIND 10 source code commits]

The branch, trac1004 has been updated
       via  d57f30ffe93b7f45aa6492ea1fba5d594adc01df (commit)
       via  690dafd743f765f04b21d3ce15ec0a63da6a53bd (commit)
      from  251a32a1fd1e7be23d59790e57a4b40fbcdceae3 (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 d57f30ffe93b7f45aa6492ea1fba5d594adc01df
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Jun 27 00:17:21 2011 +0200

    [trac1004] typo

commit 690dafd743f765f04b21d3ce15ec0a63da6a53bd
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Jun 27 00:14:08 2011 +0200

    [trac1004] also make sure 'foobar' is ignored when root is 'foo'

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

Summary of changes:
 src/lib/config/ccsession.cc                 |    2 +-
 src/lib/config/ccsession.h                  |    4 ++--
 src/lib/config/tests/ccsession_unittests.cc |    8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/config/ccsession.cc b/src/lib/config/ccsession.cc
index 7eafd43..a1adcf8 100644
--- a/src/lib/config/ccsession.cc
+++ b/src/lib/config/ccsession.cc
@@ -260,7 +260,7 @@ getRelatedLoggers(ConstElementPtr loggers) {
 
     BOOST_FOREACH(ConstElementPtr cur_logger, loggers->listValue()) {
         const std::string cur_name = cur_logger->get("name")->stringValue();
-        if (cur_name.find(root_name) == 0) {
+        if (cur_name == root_name || cur_name.find(root_name + ".") == 0) {
             our_names.insert(cur_name);
             result->add(cur_logger);
         }
diff --git a/src/lib/config/ccsession.h b/src/lib/config/ccsession.h
index 5c6975a..7dc34ba 100644
--- a/src/lib/config/ccsession.h
+++ b/src/lib/config/ccsession.h
@@ -400,8 +400,8 @@ default_logconfig_handler(const std::string& module_name,
 /// are running, this function may be moved to the unnamed namespace
 ///
 /// \param loggers the original 'loggers' config list
-/// \returns ListElement containing only loggers relevant for this
-///          module, where * is replaced by the root logger name
+/// \return ListElement containing only loggers relevant for this
+///         module, where * is replaced by the root logger name
 isc::data::ConstElementPtr
 getRelatedLoggers(isc::data::ConstElementPtr loggers);
 
diff --git a/src/lib/config/tests/ccsession_unittests.cc b/src/lib/config/tests/ccsession_unittests.cc
index 1dfd9fb..e1a4f9d 100644
--- a/src/lib/config/tests/ccsession_unittests.cc
+++ b/src/lib/config/tests/ccsession_unittests.cc
@@ -649,11 +649,19 @@ TEST(LogConfigTest, relatedLoggersTest) {
     // The default root logger name is "bind10"
     doRelatedLoggersTest("[{ \"name\": \"other_module\" }]",
                          "[]");
+    doRelatedLoggersTest("[{ \"name\": \"other_module.somelib\" }]",
+                         "[]");
+    doRelatedLoggersTest("[{ \"name\": \"bind10_other\" }]",
+                         "[]");
+    doRelatedLoggersTest("[{ \"name\": \"bind10_other.somelib\" }]",
+                         "[]");
     doRelatedLoggersTest("[ { \"name\": \"other_module\" },"
                          "  { \"name\": \"bind10\" }]",
                          "[ { \"name\": \"bind10\" } ]");
     doRelatedLoggersTest("[ { \"name\": \"bind10\" }]",
                          "[ { \"name\": \"bind10\" } ]");
+    doRelatedLoggersTest("[ { \"name\": \"bind10.somelib\" }]",
+                         "[ { \"name\": \"bind10.somelib\" } ]");
     doRelatedLoggersTest("[ { \"name\": \"other_module.somelib\" },"
                          "  { \"name\": \"bind10.somelib\" }]",
                          "[ { \"name\": \"bind10.somelib\" } ]");