BIND 10 trac1912, updated. 0010be465624ebd2c72aa41e9a56935e76f3da5c [1912] add another test case where DS somehow exists under a cut and is asked.

[BIND 10 source code commits]

The branch, trac1912 has been updated
       via  0010be465624ebd2c72aa41e9a56935e76f3da5c (commit)
      from  7d6667db23ab1724f9e30b148456742a46bfc0e1 (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 0010be465624ebd2c72aa41e9a56935e76f3da5c
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Jun 1 13:58:24 2012 -0700

    [1912] add another test case where DS somehow exists under a cut and is asked.
    
    just confirming the behavior; the implementation should already handle this
    case correctly.

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

Summary of changes:
 src/lib/datasrc/tests/database_unittest.cc |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 2251c49..55d8052 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -162,6 +162,11 @@ const char* const TEST_RECORDS[][5] = {
     {"insecdelegation.example.org.", "NS", "3600", "", "ns.example.com."},
     {"insecdelegation.example.org.", "NSEC", "3600", "",
      "dummy.example.org. NS NSEC"},
+    // and a DS under the zone cut. Such an RR shouldn't exist in a sane zone,
+    // but it could by error or some malicious attempt.  It shouldn't confuse
+    // the implementation)
+    {"child.insecdelegation.example.org.", "DS", "3600", "", "DS 5 3 3600 "
+     "20000101000000 20000201000000 12345 example.org. FAKEFAKEFAKE"},
 
     // Broken NS
     {"brokenns1.example.org.", "A", "3600", "", "192.0.2.1"},
@@ -2238,6 +2243,16 @@ TYPED_TEST(DatabaseClientTest, findDS) {
                this->expected_rdatas_, this->expected_sig_rdatas_,
                ZoneFinder::RESULT_NSEC_SIGNED,
                Name("insecdelegation.example.org."), ZoneFinder::FIND_DNSSEC);
+
+    // Some insane case: DS under a zone cut.  It's included in the DB, but
+    // shouldn't be visible via finder.
+    this->expected_rdatas_.clear();
+    this->expected_rdatas_.push_back("ns.example.com");
+    doFindTest(*finder, Name("child.insecdelegation.example.org"),
+               RRType::DS(), RRType::NS(), this->rrttl_,
+               ZoneFinder::DELEGATION, this->expected_rdatas_,
+               this->empty_rdatas_, ZoneFinder::RESULT_DEFAULT,
+               Name("insecdelegation.example.org."), ZoneFinder::FIND_DNSSEC);
 }
 
 TYPED_TEST(DatabaseClientTest, emptyDomain) {