BIND 10 trac738, updated. fc29e92af2bd2cfe8fa77dd311b9382680fd6324 [trac738] Fix distcheck failure

[BIND 10 source code commits]

The branch, trac738 has been updated
       via  fc29e92af2bd2cfe8fa77dd311b9382680fd6324 (commit)
       via  9129a474d3289157a4d8eb761383352dbfc2586e (commit)
      from  84fcd68d77cc4aba23721e234622c33666e96c49 (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 fc29e92af2bd2cfe8fa77dd311b9382680fd6324
Author: Stephen Morris <stephen at isc.org>
Date:   Thu Jun 23 13:27:52 2011 +0100

    [trac738] Fix distcheck failure

commit 9129a474d3289157a4d8eb761383352dbfc2586e
Author: Stephen Morris <stephen at isc.org>
Date:   Thu Jun 23 12:32:12 2011 +0100

    [trac738] Changes to non build-related items after review

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

Summary of changes:
 src/bin/auth/auth_log.h        |    2 +-
 src/bin/auth/auth_messages.mes |   19 ++++++++++---------
 src/bin/auth/auth_srv.cc       |    2 +-
 src/bin/auth/command.cc        |    5 ++---
 4 files changed, 14 insertions(+), 14 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_log.h b/src/bin/auth/auth_log.h
index 595046c..5205624 100644
--- a/src/bin/auth/auth_log.h
+++ b/src/bin/auth/auth_log.h
@@ -16,7 +16,7 @@
 #define __AUTH_LOG__H
 
 #include <log/macros.h>
-#include "auth_messages.h"
+#include <auth/auth_messages.h>
 
 namespace isc {
 namespace auth {
diff --git a/src/bin/auth/auth_messages.mes b/src/bin/auth/auth_messages.mes
index ccbf0b3..8553d17 100644
--- a/src/bin/auth/auth_messages.mes
+++ b/src/bin/auth/auth_messages.mes
@@ -25,7 +25,7 @@ This is a debug message output when the authoritative server has received
 an AXFR query over UDP. Use of UDP for AXFRs is not permitted by the
 protocol, so the server will return a FORMERR error to the sender.
 
-% AUTH_COMMAND_FAILED execution of command '%1' failed: %2
+% AUTH_COMMAND_FAILED execution of command channel instruction '%1' failed: %2
 Execution of the specified command by the authoritative server failed. The
 message contains the reason for the failure.
 
@@ -74,14 +74,14 @@ reason for the failure is given in the message.) The server will drop the
 packet.
 
 % AUTH_LOAD_TSIG loading TSIG keys
-This is a debug message indicating that the authoritiative server has
-successfully accessed the keyring holding TSIG keys. It is issued during
-server startup is an indication that the initialization is proceeding
-normally.
+This is a debug message indicating that the authoritiative server
+has requested the keyring holding TSIG keys from the configuration
+database. It is issued during server startup is an indication that the
+initialization is proceeding normally.
 
 % AUTH_LOAD_ZONE loaded zone %1/%2
 This debug message is issued during the processing of the 'loadzone' command
-when the authoritative server has successfully loaded the names zone of the
+when the authoritative server has successfully loaded the named zone of the
 named class.
 
 % AUTH_MEM_DATASRC_DISABLED memory data source is disabled for class %1
@@ -93,8 +93,9 @@ This is a debug message reporting that the authoritative server has
 discovered that the memory data source is enabled for the given class.
 
 % AUTH_NO_STATS_SESSION session interface for statistics is not available
-For some reason, the authoritative server has no session with the statistics
-module is available. This could be an error in configuration.
+The authoritative server had no session with the statistics module at the
+time it attempted to send it data: the attempt has been abandoned. This
+could be an error in configuration.
 
 % AUTH_NO_XFRIN received NOTIFY but XFRIN session is not running
 This is a debug message produced by the authoritative server when it receives
@@ -148,7 +149,7 @@ This is a debug message issued when the authoritative server has received
 a command on the command channel.
 
 % AUTH_RECEIVED_SENDSTATS command 'sendstats' received
-This is a debug message issues when the authoritative server has received
+This is a debug message issued when the authoritative server has received
 a command from the statistics module to send it data. The 'sendstats'
 command is handled differently to other commands, which is why the debug
 message associated with it has its own code.
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 02c437f..f29fd05 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -640,7 +640,7 @@ AuthSrvImpl::processNotify(const IOMessage& io_message, MessagePtr message,
             return (false);
         }
     } catch (const Exception& ex) {
-            LOG_ERROR(auth_logger, AUTH_ZONEMGR_COMMS).arg(ex.what());
+        LOG_ERROR(auth_logger, AUTH_ZONEMGR_COMMS).arg(ex.what());
         return (false);
     }
 
diff --git a/src/bin/auth/command.cc b/src/bin/auth/command.cc
index d53de98..fe3d729 100644
--- a/src/bin/auth/command.cc
+++ b/src/bin/auth/command.cc
@@ -232,9 +232,8 @@ execAuthServerCommand(AuthSrv& server, const string& command_id,
         scoped_ptr<AuthCommand>(createAuthCommand(command_id))->exec(server,
                                                                      args);
     } catch (const isc::Exception& ex) {
-        // TODO: SHould this be LOG_ERROR?
-        LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_COMMAND_FAILED)
-                  .arg(command_id).arg(ex.what());
+        LOG_ERROR(auth_logger, AUTH_COMMAND_FAILED).arg(command_id)
+                                                   .arg(ex.what());
         return (createAnswer(1, ex.what()));
     }