BIND 10 trac2219, updated. aa53f0f7d8c06ea9dd7082971d080895a56d6c14 [2219] style fix: indententation

[BIND 10 source code commits]

The branch, trac2219 has been updated
       via  aa53f0f7d8c06ea9dd7082971d080895a56d6c14 (commit)
       via  c13d8c76021cb27bf9d5f0bf899b267ca04caa21 (commit)
       via  6a1a234386523e5be05adf0a6ac51df29bf3b7a6 (commit)
      from  01244a662e1ad9387e27c2f5e1723c954d47a12b (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 aa53f0f7d8c06ea9dd7082971d080895a56d6c14
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Sep 24 12:54:25 2012 -0700

    [2219] style fix: indententation

commit c13d8c76021cb27bf9d5f0bf899b267ca04caa21
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Sep 24 12:49:40 2012 -0700

    [2219] clarify the special case of InMemoryZoneFinder::getOrigin() in comments.

commit 6a1a234386523e5be05adf0a6ac51df29bf3b7a6
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Sep 24 12:47:13 2012 -0700

    [2219] Revert "avoid redundant initial configuration for data sources."
    
    According to review discussion.
    This reverts commit a61af89b9799857a955e5e0b7b04b1f273dd63ab.

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

Summary of changes:
 src/bin/auth/datasrc_configurator.h   |   18 +-----------------
 src/lib/datasrc/memory/zone_finder.cc |   15 ++++++++++-----
 2 files changed, 11 insertions(+), 22 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/datasrc_configurator.h b/src/bin/auth/datasrc_configurator.h
index d6ea7f2..f305a0d 100644
--- a/src/bin/auth/datasrc_configurator.h
+++ b/src/bin/auth/datasrc_configurator.h
@@ -48,21 +48,6 @@ private:
                                     isc::data::ConstElementPtr config,
                                     const isc::config::ConfigData&)
     {
-        // XXX: when this is first called it's a callback as a result of
-        // registration in addRemoteConfig().  Since the configuration can
-        // be incomplete, the main() function will then reconfigure the
-        // data sources with full configurations.  The redundant initialization
-        // can take too long if there's a large zone in-memory in the
-        // configuration, so we'll skip the first configuration setup
-        // completely.  This should be safe as long as main() explicitly
-        // configures everything, but we should eventually solve it in a
-        // cleaner way.
-        static bool started_ = false;
-        if (!started_) {
-            started_ = true;
-            return;
-        }
-
         if (config->contains("classes")) {
             reconfigure(config->get("classes"));
         }
@@ -84,8 +69,7 @@ public:
     /// \param session The session to hook into and to access the configuration
     ///     through.
     /// \param server It is the server to configure.
-    /// \throw isc::InvalidOperation if this is called when already
-    ///     initialized.
+    /// \throw isc::InvalidOperation if this is called when already initialized.
     /// \throw isc::InvalidParameter if any of the parameters is NULL
     /// \throw isc::config::ModuleCCError if the remote configuration is not
     ///     available for some reason.
diff --git a/src/lib/datasrc/memory/zone_finder.cc b/src/lib/datasrc/memory/zone_finder.cc
index 50460d3..25c2764 100644
--- a/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@ -194,8 +194,9 @@ createFindResult(const RRClass& rrclass,
         }
     }
 
-    return (ZoneFinderResultContext(code, createTreeNodeRRset(
-                                        node, rdset, rrclass, options, rename),
+    return (ZoneFinderResultContext(code, createTreeNodeRRset(node, rdset,
+                                                              rrclass, options,
+                                                              rename),
                                     flags, node));
 }
 
@@ -779,9 +780,13 @@ InMemoryZoneFinder::getOrigin() const {
     if (node_labels.isAbsolute()) {
         data = node_labels.getData(&data_len);
     } else {
-        // If and when we allow non absolute label at the origin (e.g. for
-        // the convenience of out-of-zone glue handling), we first need to
-        // construct the absolute label sequence and then construct the name.
+        // In future we may allow adding out-of-zone names in the zone tree.
+        // For example, to hold out-of-zone NS names so we can establish a
+        // shortcut link to them as an optimization.  If and when that happens
+        // the origin node may not have an absolute label (consider the zone
+        // is example.org and we add ns.noexample.org).  In that case
+        // we first need to construct the absolute label sequence and then
+        // construct the name.
         uint8_t labels_buf[LabelSequence::MAX_SERIALIZED_LENGTH];
         const LabelSequence name_labels =
             zone_data_.getOriginNode()->getAbsoluteLabels(labels_buf);