BIND 10 master, updated. bf41f8dc2265ca0cd9ffb8b8c11047291e69ca3c [trac1022] ChangeLog for trac 1022 and 1023.

[BIND 10 source code commits]

The branch, master has been updated
       via  bf41f8dc2265ca0cd9ffb8b8c11047291e69ca3c (commit)
       via  926a65fa08617be677a93e9e388df0f229b01067 (commit)
       via  2d39d007d30f65589cfe4b671dc91cdab70ed107 (commit)
       via  c4430b49b30dcd74226d272fa3da4812afc2c6f7 (commit)
      from  e9798fc8931856a7eaeee37155600146d7dc7c57 (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 bf41f8dc2265ca0cd9ffb8b8c11047291e69ca3c
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Jun 21 17:47:35 2011 +0100

    [trac1022] ChangeLog for trac 1022 and 1023.

commit 926a65fa08617be677a93e9e388df0f229b01067
Merge: 2d39d007d30f65589cfe4b671dc91cdab70ed107 e9798fc8931856a7eaeee37155600146d7dc7c57
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Jun 21 17:41:58 2011 +0100

    Merge branch 'master' into trac1022

commit 2d39d007d30f65589cfe4b671dc91cdab70ed107
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jun 21 10:23:12 2011 +0200

    [trac1023] Empty line

commit c4430b49b30dcd74226d272fa3da4812afc2c6f7
Author: Stephen Morris <stephen at isc.org>
Date:   Mon Jun 20 14:10:18 2011 +0100

    [trac1022] Address tickets 1022 and 1023

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

Summary of changes:
 ChangeLog                |    6 ++++++
 src/bin/auth/main.cc     |    6 ++++++
 src/lib/datasrc/cache.cc |   17 +++++++++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 6c6da37..3980945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+259.	[bug]       stephen
+	Logging now correctly initialized in b10-auth.  Also, fixed
+	bug whereby querying for "version.bind txt ch" would cause
+	b10-auth to crash if BIND 10 was started with the "-v" switch.
+	(Trac 1022,1023, git 926a65fa08617be677a93e9e388df0f229b01067)
+
 258.	[build]		jelte
 	Now builds and runs with Python 3.2
 	(Trac #710, git dae1d2e24f993e1eef9ab429326652f40a006dfb)
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index 0324c6e..36c616e 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -47,6 +47,7 @@
 #include <asiodns/asiodns.h>
 #include <asiolink/asiolink.h>
 #include <log/dummylog.h>
+#include <log/logger_support.h>
 #include <server_common/keyring.h>
 
 using namespace std;
@@ -118,6 +119,11 @@ main(int argc, char* argv[]) {
         usage();
     }
 
+    // Initialize logging.  If verbose, we'll use maximum verbosity.
+    isc::log::initLogger("b10-auth",
+                         (verbose_mode ? isc::log::DEBUG : isc::log::INFO),
+                         isc::log::MAX_DEBUG_LEVEL, NULL);
+
     int ret = 0;
 
     // XXX: we should eventually pass io_service here.
diff --git a/src/lib/datasrc/cache.cc b/src/lib/datasrc/cache.cc
index 8e9487d..9082a6b 100644
--- a/src/lib/datasrc/cache.cc
+++ b/src/lib/datasrc/cache.cc
@@ -100,6 +100,19 @@ public:
     /// \return \c RRsetPtr
     RRsetPtr getRRset() const { return (entry->rrset); }
 
+    /// \brief Returns name associated with cached node
+    ///
+    /// This is the name associated with the RRset if it is a positive
+    /// entry, and the associated question name if the RRSet is NULL
+    /// and this is a negative entry (together with an indication that
+    /// this is a negative entry).
+    string getNodeName() const {
+        if (getRRset()) {
+            return (getRRset()->getName().toText());
+        }
+        return (std::string("negative entry for ") + question.toText());
+    }
+
     /// \brief Returns the query response flags associated with the data.
     ///
     /// \return \c uint32_t
@@ -213,7 +226,7 @@ HotCacheImpl::HotCacheImpl(int slots, bool enabled) :
 inline void
 HotCacheImpl::insert(const CacheNodePtr node) {
     LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_CACHE_INSERT).
-        arg(node->getRRset()->getName());
+        arg(node->getNodeName());
     std::map<Question, CacheNodePtr>::const_iterator iter;
     iter = map_.find(node->question);
     if (iter != map_.end()) {
@@ -253,7 +266,7 @@ HotCacheImpl::promote(CacheNodePtr node) {
 void
 HotCacheImpl::remove(ConstCacheNodePtr node) {
     LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_CACHE_REMOVE).
-        arg(node->getRRset()->getName());
+        arg(node->getNodeName());
     lru_.erase(node->lru_entry_);
     map_.erase(node->question);
     --count_;