From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 27 Aug 2013 08:14:49 +0000 (+0200)
Subject: [3075] A few trivial fixes in dhcp-ddns.
X-Git-Tag: bind10-1.2.0beta1-release~241^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=968bc96429fc12aea18e5e4186fcafcb5f29dc58;p=thirdparty%2Fkea.git

[3075] A few trivial fixes in dhcp-ddns.
---

diff --git a/src/bin/d2/d2_config.cc b/src/bin/d2/d2_config.cc
index 6415e5600e..f2ee4a8462 100644
--- a/src/bin/d2/d2_config.cc
+++ b/src/bin/d2/d2_config.cc
@@ -159,7 +159,7 @@ DdnsDomainListMgr::matchDomain(const std::string& fqdn, DdnsDomainPtr& domain) {
 // *********************** TSIGKeyInfoParser  *************************
 
 TSIGKeyInfoParser::TSIGKeyInfoParser(const std::string& entry_name,
-    TSIGKeyInfoMapPtr keys)
+                                     TSIGKeyInfoMapPtr keys)
     : entry_name_(entry_name), keys_(keys), local_scalars_() {
     if (!keys_) {
         isc_throw(D2CfgError, "TSIGKeyInfoParser ctor:"
diff --git a/src/bin/d2/d2_process.h b/src/bin/d2/d2_process.h
index f9c966c503..08bbe14893 100644
--- a/src/bin/d2/d2_process.h
+++ b/src/bin/d2/d2_process.h
@@ -65,7 +65,7 @@ public:
 
     /// @brief Constructor
     ///
-    /// Construction creates the configuration manager, the queue 
+    /// Construction creates the configuration manager, the queue
     /// manager, and the update manager.
     ///
     /// @param name name is a text label for the process. Generally used
@@ -79,11 +79,11 @@ public:
     /// @brief Called after instantiation to perform initialization unique to
     /// D2.
     ///
-    /// This is invoked by the controller after command line arguments but 
-    /// PRIOR to configuration reception.  The base class provides this method 
-    /// as a place to perform any derivation-specific initialization steps 
-    /// that are inapppropriate for the constructor but necessary prior to 
-    /// launch.  So far, no such steps have been identified for D2, so its 
+    /// This is invoked by the controller after command line arguments but
+    /// PRIOR to configuration reception.  The base class provides this method
+    /// as a place to perform any derivation-specific initialization steps
+    /// that are inapppropriate for the constructor but necessary prior to
+    /// launch.  So far, no such steps have been identified for D2, so its
     /// implementantion is empty but required.
     ///
     /// @throw DProcessBaseError if the initialization fails.
@@ -93,7 +93,7 @@ public:
     ///
     /// Once entered, the main control thread remains inside this method
     /// until shutdown.  The event loop logic is as follows:
-    /// @code 
+    /// @code
     ///    while should not down {
     ///       process queue manager state change
     ///       process completed jobs
@@ -102,7 +102,7 @@ public:
     ///
     ///       ON an exception, exit with fatal error
     ///    }
-    /// @endcode 
+    /// @endcode
     ///
     /// To summarize, each pass through the event loop first checks the state
     /// of the received queue and takes any steps required to ensure it is
@@ -242,8 +242,10 @@ protected:
     /// If callbacks are ready to be executed upon entry, the method will
     /// return as soon as these callbacks have completed.  If no callbacks
     /// are ready, then it will wait (indefinitely) until at least one callback
-    /// is executed. (@note: Should become desirable to periodically force an
-    /// event, an interval timer could be used to do so).
+    /// is executed.
+    ///
+    /// @note: Should become desirable to periodically force an
+    /// event, an interval timer could be used to do so.
     ///
     /// @return The number of callback handlers executed, or 0 if the IO
     /// service has been stopped.
@@ -273,7 +275,7 @@ protected:
 
     /// @brief Sets the shutdown type to the given value.
     ///
-    /// @param value is the new value to assign to shutdown type. 
+    /// @param value is the new value to assign to shutdown type.
     ///
     /// @note this method is really only intended for testing purposes.
     void setShutdownType(const ShutdownType& value) {
@@ -301,8 +303,8 @@ public:
         return (reconf_queue_flag_);
     }
 
-    /// @brief Returns the type of shutdown requested.  
-    /// 
+    /// @brief Returns the type of shutdown requested.
+    ///
     /// Note, this value is meaningless unless shouldShutdown() returns true.
     ShutdownType getShutdownType() const {
         return (shutdown_type_);
diff --git a/src/bin/d2/dhcp-ddns.spec b/src/bin/d2/dhcp-ddns.spec
index 767f647086..f60ea9f81e 100644
--- a/src/bin/d2/dhcp-ddns.spec
+++ b/src/bin/d2/dhcp-ddns.spec
@@ -195,7 +195,7 @@
     "commands": [
         {
             "command_name": "shutdown",
-            "command_description": "Shuts down b1-dhcp-ddns module server.",
+            "command_description": "Shuts down b10-dhcp-ddns module server.",
             "command_args": [
             {
                 "item_name": "type",
diff --git a/src/lib/dhcp_ddns/dhcp_ddns_messages.mes b/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
index 1bc290383b..51688ad646 100644
--- a/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
+++ b/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
@@ -1,4 +1,3 @@
-/Users/tmark/ddns/build/trac3075/bind10
 # Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any