BIND 10 trac3075, updated. 968bc96429fc12aea18e5e4186fcafcb5f29dc58 [3075] A few trivial fixes in dhcp-ddns.
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Aug 27 08:15:19 UTC 2013
The branch, trac3075 has been updated
via 968bc96429fc12aea18e5e4186fcafcb5f29dc58 (commit)
from f004912dd236a53ee63ab51e937de7988681a22f (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 968bc96429fc12aea18e5e4186fcafcb5f29dc58
Author: Marcin Siodelski <marcin at isc.org>
Date: Tue Aug 27 10:14:49 2013 +0200
[3075] A few trivial fixes in dhcp-ddns.
-----------------------------------------------------------------------
Summary of changes:
src/bin/d2/d2_config.cc | 2 +-
src/bin/d2/d2_process.h | 28 +++++++++++++++-------------
src/bin/d2/dhcp-ddns.spec | 2 +-
src/lib/dhcp_ddns/dhcp_ddns_messages.mes | 1 -
4 files changed, 17 insertions(+), 16 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/d2/d2_config.cc b/src/bin/d2/d2_config.cc
index 6415e56..f2ee4a8 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 f9c966c..08bbe14 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 767f647..f60ea9f 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 1bc2903..51688ad 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
More information about the bind10-changes
mailing list