BIND 10 trac2218_2, updated. eee7c05de1c33b0d932ebbaca4370129d315e0ba [2218] Don't upcase the first label when inserting into NSEC3 tree

[BIND 10 source code commits]

The branch, trac2218_2 has been updated
       via  eee7c05de1c33b0d932ebbaca4370129d315e0ba (commit)
       via  5ba139c6882f7399449eafdefb2202578fbe2903 (commit)
      from  e5ad751d8372bb0306d4eb5b8311a7b9cb7c7c32 (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 eee7c05de1c33b0d932ebbaca4370129d315e0ba
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 21 09:02:21 2012 +0530

    [2218] Don't upcase the first label when inserting into NSEC3 tree
    
    This is no longer required as tree.find() works without it.

commit 5ba139c6882f7399449eafdefb2202578fbe2903
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 21 08:52:44 2012 +0530

    [2218] Simplify code, also shortcutting RRset construction

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

Summary of changes:
 src/lib/datasrc/memory/memory_client.cc            |    9 +--------
 .../datasrc/memory/tests/zone_finder_unittest.cc   |    9 +--------
 src/lib/datasrc/memory/zone_finder.cc              |   15 ++++++---------
 3 files changed, 8 insertions(+), 25 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 6096e78..3aee0be 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -325,15 +325,8 @@ public:
             }
         }
 
-        // Make just the NSEC3 hash label uppercase, and insert the
-        // entire name into the NSEC3Data ZoneTree.
-        string fst_label = rrset->getName().split(0, 1).toText(true);
-        transform(fst_label.begin(), fst_label.end(), fst_label.begin(),
-                  ::toupper);
-        const string rest = rrset->getName().split(1).toText(true);
-
         ZoneNode* node;
-        nsec3_data->insertName(mem_sgmt_, Name(fst_label + "." + rest), &node);
+        nsec3_data->insertName(mem_sgmt_, rrset->getName(), &node);
 
         RdataEncoder encoder;
 
diff --git a/src/lib/datasrc/memory/tests/zone_finder_unittest.cc b/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
index 552a85a..c10310e 100644
--- a/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
+++ b/src/lib/datasrc/memory/tests/zone_finder_unittest.cc
@@ -280,15 +280,8 @@ public:
              }
         }
 
-        // Make just the NSEC3 hash label uppercase, and insert the
-        // entire name into the NSEC3Data ZoneTree.
-        string fst_label = rrset->getName().split(0, 1).toText(true);
-        transform(fst_label.begin(), fst_label.end(), fst_label.begin(),
-                  ::toupper);
-        const string rest = rrset->getName().split(1).toText(true);
-
         ZoneNode *node;
-        nsec3_data->insertName(mem_sgmt_, Name(fst_label + "." + rest), &node);
+        nsec3_data->insertName(mem_sgmt_, rrset->getName(), &node);
 
         // We assume that rrsig has already been checked to match rrset
         // by the caller.
diff --git a/src/lib/datasrc/memory/zone_finder.cc b/src/lib/datasrc/memory/zone_finder.cc
index 07fc78e..cdbdb07 100644
--- a/src/lib/datasrc/memory/zone_finder.cc
+++ b/src/lib/datasrc/memory/zone_finder.cc
@@ -689,10 +689,9 @@ InMemoryZoneFinder::findNSEC3(const isc::dns::Name& name, bool recursive) {
             RdataSet* rdataset = node->getData();
             ConstRRsetPtr closest = createTreeNodeRRset(node, rdataset,
                                                         getClass());
-            ConstRRsetPtr next =
-                createTreeNodeRRset(covering_node,
-                                    (covering_node != NULL ?
-                                     covering_node->getData() : NULL),
+            ConstRRsetPtr next = (covering_node == NULL) ?
+                ConstRRsetPtr() :
+                createTreeNodeRRset(covering_node, covering_node->getData(),
                                     getClass());
 
             LOG_DEBUG(logger, DBG_TRACE_BASIC,
@@ -725,11 +724,9 @@ InMemoryZoneFinder::findNSEC3(const isc::dns::Name& name, bool recursive) {
             }
 
             if (!recursive) {   // in non recursive mode, we are done.
-                ConstRRsetPtr closest =
-                    createTreeNodeRRset(covering_node,
-                                        (covering_node != NULL ?
-                                         covering_node->getData() :
-                                         NULL),
+                ConstRRsetPtr closest = (covering_node == NULL) ?
+                    ConstRRsetPtr() :
+                    createTreeNodeRRset(covering_node, covering_node->getData(),
                                         getClass());
 
                 if (closest) {