BIND 10 trac1066, updated. 4ff5e524a7f79ad7f4513ebed3ca0990392263af [1066] add one test and typo in comment

[BIND 10 source code commits]

The branch, trac1066 has been updated
       via  4ff5e524a7f79ad7f4513ebed3ca0990392263af (commit)
      from  b4ae924f504e9749989059a14e6a5dc830c99e81 (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 4ff5e524a7f79ad7f4513ebed3ca0990392263af
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Aug 23 13:54:20 2011 +0200

    [1066] add one test and typo in comment

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

Summary of changes:
 src/lib/datasrc/database.cc                |    2 +-
 src/lib/datasrc/tests/database_unittest.cc |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index bafd6a9..71a345b 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -340,7 +340,7 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
                 // It contains some RRs, so it exists.
                 last_known = superdomain.getLabelCount();
                 // In case we are in GLUE_OK, we want to store the highest
-                // encounderet RRset.
+                // encountered RRset.
                 if (glue_ok && !first_ns && i != remove_labels) {
                     first_ns = getRRset(superdomain, NULL, false, false,
                                         true).second;
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index a0efd50..06d08fc 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -1037,6 +1037,14 @@ TEST_F(DatabaseClientTest, wildcard) {
                isc::dns::RRType::A(), isc::dns::RRType::A(),
                isc::dns::RRTTL(3600), ZoneFinder::NXRRSET, expected_rdatas_,
                expected_sig_rdatas_);
+    // Also make sure that the wildcard doesn't hurt the original data
+    // below the wildcard
+    expected_rdatas_.push_back("2001:db8::5");
+    doFindTest(finder, isc::dns::Name("cancel.here.wild.example.org"),
+               isc::dns::RRType::AAAA(), isc::dns::RRType::AAAA(),
+               isc::dns::RRTTL(3600), ZoneFinder::SUCCESS,
+               expected_rdatas_, expected_sig_rdatas_);
+    expected_rdatas_.clear();
 
     // How wildcard go together with delegation
     expected_rdatas_.push_back("ns.example.com.");