BIND 10 trac1063, updated. 0fe4f0151ae7a994aaf305e7985d4ba9f992e482 [1063] Name of DB in log messages

[BIND 10 source code commits]

The branch, trac1063 has been updated
       via  0fe4f0151ae7a994aaf305e7985d4ba9f992e482 (commit)
      from  4cbf309be8a302afe3bc041da11c24b593464157 (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 0fe4f0151ae7a994aaf305e7985d4ba9f992e482
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Aug 16 15:28:52 2011 +0200

    [1063] Name of DB in log messages

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

Summary of changes:
 src/lib/datasrc/database.cc          |    6 +++---
 src/lib/datasrc/datasrc_messages.mes |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index b9d7330..166a1d2 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -316,12 +316,12 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
                 if (result_rrset->getType() == isc::dns::RRType::NS()) {
                     LOG_DEBUG(logger, DBG_TRACE_DETAILED,
                               DATASRC_DATABASE_FOUND_DELEGATION).
-                        arg(superdomain);
+                        arg(database_->getDBName()).arg(superdomain);
                     result_status = DELEGATION;
                 } else {
                     LOG_DEBUG(logger, DBG_TRACE_DETAILED,
                               DATASRC_DATABASE_FOUND_DNAME).
-                        arg(superdomain);
+                        arg(database_->getDBName()).arg(superdomain);
                     result_status = DNAME;
                 }
                 // Don't search more
@@ -341,7 +341,7 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
                 result_rrset->getType() == isc::dns::RRType::NS()) {
                 LOG_DEBUG(logger, DBG_TRACE_DETAILED,
                           DATASRC_DATABASE_FOUND_DELEGATION_EXACT).
-                    arg(name);
+                    arg(database_->getDBName()).arg(name);
                 result_status = DELEGATION;
             } else if (result_rrset && type != isc::dns::RRType::CNAME() &&
                        result_rrset->getType() == isc::dns::RRType::CNAME()) {
diff --git a/src/lib/datasrc/datasrc_messages.mes b/src/lib/datasrc/datasrc_messages.mes
index a080a6a..190adbe 100644
--- a/src/lib/datasrc/datasrc_messages.mes
+++ b/src/lib/datasrc/datasrc_messages.mes
@@ -90,16 +90,16 @@ most likely points to a logic error in the code, and can be considered a bug.
 The current search is aborted. Specific information about the exception is
 printed in this error message.
 
-% DATASRC_DATABASE_FOUND_DELEGATION Found delegation at %1
+% DATASRC_DATABASE_FOUND_DELEGATION Found delegation at %2 in %1
 When searching for a domain, the program met a delegation to a different zone
 at the given domain name. It will return that one instead.
 
-% DATASRC_DATABASE_FOUND_DELEGATION_EXACT Found delegation at %1 (exact match)
+% DATASRC_DATABASE_FOUND_DELEGATION_EXACT Found delegation at %2 (exact match) in %1
 The program found the domain requested, but it is a delegation point to a
 different zone, therefore it is not authoritative for this domain name.
 It will return the NS record instead.
 
-% DATASRC_DATABASE_FOUND_DNAME Found DNAME at %1
+% DATASRC_DATABASE_FOUND_DNAME Found DNAME at %2 in %1
 When searching for a domain, the program met a DNAME redirection to a different
 place in the domain space at the given domain name. It will return that one
 instead.