BIND 10 trac2138, updated. 8b2212d2579f61143274fdd59105d3a05e02c54b More fix not to change commands' output to config channel.

[BIND 10 source code commits]

The branch, trac2138 has been updated
       via  8b2212d2579f61143274fdd59105d3a05e02c54b (commit)
      from  a580674f5afabb6c21ece9f1248d85edf64545e1 (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 8b2212d2579f61143274fdd59105d3a05e02c54b
Author: Kazunori Fujiwara <fujiwara at wide.ad.jp>
Date:   Thu Aug 9 14:00:50 2012 +0900

    More fix not to change commands' output to config channel.

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

Summary of changes:
 src/bin/auth/command.cc |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/command.cc b/src/bin/auth/command.cc
index 8bc218d..0a23b11 100644
--- a/src/bin/auth/command.cc
+++ b/src/bin/auth/command.cc
@@ -101,13 +101,13 @@ public:
     /// \param server The \c AuthSrv object on which the command is executed.
     /// \param args Command specific argument.
     /// \return command result data in JSON format.
-    virtual ElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr args) = 0;
+    virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr args) = 0;
 };
 
 // Handle the "shutdown" command.
 class ShutdownCommand : public AuthCommand {
 public:
-    virtual ElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr args) {
+    virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr args) {
         // Is the pid argument provided?
         if (args && args->contains("pid")) {
             // If it is, we check it is the same as our PID
@@ -123,44 +123,44 @@ public:
                 // there are multiple instances of the server running and
                 // another instance is being shut down, we get the message
                 // too, due to the multicast nature of our message bus.
-                return (Element::createList());
+                return (createAnswer());
             }
         }
         LOG_DEBUG(auth_logger, DBG_AUTH_SHUT, AUTH_SHUTDOWN);
         server.stop();
-        return (Element::createList());
+        return (createAnswer());
     }
 };
 
 // Handle the "getstats" command.  The argument is a list.
 class GetStatsCommand : public AuthCommand {
 public:
-    virtual ElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
+    virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
         LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_RECEIVED_SENDSTATS);
-        return (server.getStatistics());
+        return (createAnswer(0, server.getStatistics()));
     }
 };
 
 class StartDDNSForwarderCommand : public AuthCommand {
 public:
-    virtual ElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
+    virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
         server.createDDNSForwarder();
-        return (Element::fromJSON("{}"));
+        return (createAnswer());
     }
 };
 
 class StopDDNSForwarderCommand : public AuthCommand {
 public:
-    virtual ElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
+    virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
         server.destroyDDNSForwarder();
-        return (Element::fromJSON("{}"));
+        return (createAnswer());
     }
 };
 
 // Handle the "loadzone" command.
 class LoadZoneCommand : public AuthCommand {
 public:
-    virtual ElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr args) {
+    virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr args) {
         if (args == NULL) {
             isc_throw(AuthCommandError, "Null argument");
         }
@@ -188,7 +188,7 @@ public:
                 // Everything worked fine.
                 LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_LOAD_ZONE)
                     .arg(zone_class).arg(origin);
-                return (Element::createList());
+                return (createAnswer());
             case ConfigurableClientList::ZONE_NOT_FOUND:
                 isc_throw(AuthCommandError, "Zone " << origin << "/" <<
                           zone_class << " was not found in any configured "
@@ -205,7 +205,7 @@ public:
                 isc_throw(isc::Unexpected, "Cache disabled in client list of "
                           "class " << zone_class);
         }
-        return (Element::createList());
+        return (createAnswer());
     }
 };
 
@@ -240,7 +240,7 @@ ConstElementPtr
 execAuthServerCommand(AuthSrv& server, const string& command_id,
                       ConstElementPtr args)
 {
-    ElementPtr value;
+    ConstElementPtr value;
 
     LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_RECEIVED_COMMAND).arg(command_id);
     try {
@@ -252,5 +252,5 @@ execAuthServerCommand(AuthSrv& server, const string& command_id,
         return (createAnswer(1, ex.what()));
     }
 
-    return (createAnswer(0, value));
+    return (value);
 }