BIND 10 trac1771, updated. 10cc00fed2940b79e82cf583ae9b163e6b3833e3 [1771] Document may_have_glue variable

[BIND 10 source code commits]

The branch, trac1771 has been updated
       via  10cc00fed2940b79e82cf583ae9b163e6b3833e3 (commit)
       via  205b36c14c0422361a736508c97cbb76d7df6a39 (commit)
      from  fbdeb85aa4e3a315a8227b8d03829f351b084c64 (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 10cc00fed2940b79e82cf583ae9b163e6b3833e3
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jun 4 05:05:07 2012 +0530

    [1771] Document may_have_glue variable

commit 205b36c14c0422361a736508c97cbb76d7df6a39
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jun 4 04:07:41 2012 +0530

    [1771] Don't limit glue to A/AAAA records

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

Summary of changes:
 src/lib/datasrc/database.cc |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 8b789df..cd1558c 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -207,7 +207,10 @@ DatabaseClient::Finder::getRRsets(const string& name, const WantedTypes& types,
     bool seen_ds(false);
     bool seen_other(false);
     bool seen_ns(false);
-    bool seen_a(false);
+
+    // may_have_glue indicates if glue records may exist for the
+    // domain. It is true when records like this are seen:
+    // child.example. IN NS child.example.
     bool may_have_glue(false);
 
     while (context->getNext(columns)) {
@@ -258,9 +261,6 @@ DatabaseClient::Finder::getRRsets(const string& name, const WantedTypes& types,
                     may_have_glue = true;
             } else if (cur_type == RRType::DS()) {
                 seen_ds = true;
-            } else if (cur_type == RRType::A() ||
-                       cur_type == RRType::AAAA()) {
-                seen_a = true;
             } else if (cur_type != RRType::RRSIG() &&
                        cur_type != RRType::NSEC3() &&
                        cur_type != RRType::NSEC()) {
@@ -286,11 +286,11 @@ DatabaseClient::Finder::getRRsets(const string& name, const WantedTypes& types,
                       RDATA_COLUMN]);
         }
     }
-    if (seen_cname && (seen_other || seen_a || seen_ns || seen_ds)) {
+    if (seen_cname && (seen_other || seen_ns || seen_ds)) {
         isc_throw(DataSourceError, "CNAME shares domain " << name <<
                   " with something else");
     }
-    if (check_ns && seen_ns && ((!may_have_glue && seen_a) || seen_other)) {
+    if (check_ns && seen_ns && (!may_have_glue && seen_other)) {
         isc_throw(DataSourceError, "NS shares domain " << name <<
                   " with something else");
     }