BIND 10 trac2435, updated. 355fb4b538030ec31101edd4b8ea6e2ae2d90e65 [2435] Test use of FIND_GLUE_OK option

[BIND 10 source code commits]

The branch, trac2435 has been updated
       via  355fb4b538030ec31101edd4b8ea6e2ae2d90e65 (commit)
       via  34724a6251f8d624c2c69d06fc1ddb9c21f201f0 (commit)
      from  5200f31617133fc3700b802a7299efbc3a980ec5 (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 355fb4b538030ec31101edd4b8ea6e2ae2d90e65
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Jan 10 19:10:36 2013 +0530

    [2435] Test use of FIND_GLUE_OK option

commit 34724a6251f8d624c2c69d06fc1ddb9c21f201f0
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Jan 10 17:59:38 2013 +0530

    [2435] Make a minor comment update

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 5c7bab5..928f376 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -1423,7 +1423,7 @@ public:
             // etc. are returned by the ZoneFinder.
             //
             // Note that in the case that the queried type itself is
-            // CNAME, then the finder will return SUCCESS.
+            // CNAME or DNAME, then the finder will return SUCCESS.
             if (result->code == ZoneFinder::SUCCESS) {
                 return (result->rrset);
             } else {
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 134fda3..b4ad0bc 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -4241,6 +4241,16 @@ TYPED_TEST(RRsetCollectionTest, find) {
                                    this->qclass_, RRType::A());
     // Is this correct behavior?
     EXPECT_FALSE(rrset);
+
+    // With the FIND_GLUE_OK passed to ZoneFinder's find(),
+    // "delegation.example.org." with type NS should return the NS
+    // record. Without FIND_GLUE_OK, ZoneFinder's find() would return
+    // DELEGATION and the find() below would return nothing.
+    rrset = this->collection->find(Name("delegation.example.org"),
+                                   this->qclass_, RRType::NS());
+    ASSERT_TRUE(rrset);
+    EXPECT_EQ(RRType::NS(), rrset->getType());
+    EXPECT_EQ(Name("delegation.example.org"), rrset->getName());
 }
 
 TYPED_TEST(RRsetCollectionTest, iteratorTest) {