Browse Source

[1066] add one test and typo in comment

Jelte Jansen 13 years ago
parent
commit
4ff5e524a7
2 changed files with 9 additions and 1 deletions
  1. 1 1
      src/lib/datasrc/database.cc
  2. 8 0
      src/lib/datasrc/tests/database_unittest.cc

+ 1 - 1
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;

+ 8 - 0
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.");