pullup:

 799.   [bug]           The ADB didn't find AAAA glue in a zone unless A6
                        glue was also present.

diff --git a/CHANGES b/CHANGES
index 86eaaae362cdbd71bc1be86bdbdf75e28b4802cb..a1fc531c5f05fb6069dbc882ab9772eab7905755 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
  800.  [bug]           dnssec-signzone produced incorrect statistics for
                        large zones.  [RT #1133]
 
+ 799.  [bug]           The ADB didn't find AAAA glue in a zone unless A6
+                       glue was also present.
+
        --- 9.1.1 released ---
 
        --- 9.1.1rc7 released ---

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index a1466531d55ba7204791d8e8eb45c245141b81b5..ac114c564a35a11f75c2f98053a18617fd16cbe4 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.162.2.3 2001/02/28 21:20:29 bwelling Exp $ */
+/* $Id: adb.c,v 1.162.2.4 2001/04/10 00:20:57 gson Exp $ */
 
 /*
  * Implementation notes
@@ -2614,24 +2614,11 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
 
                /*
                 * If the name doesn't exist at all, jump to the fetch
-                * code.
-                *
-                * If the name exists but the A6 doesn't, try starting
-                * an aaaa database search.
-                *
-                * If neither of these are true, say we want an A6 fetch
-                * and perhaps we'll get lucky.
+                * code.  Otherwise, we'll try AAAA.
                 */
                if (NXDOMAIN_RESULT(result))
                        goto fetch;
-               else if (NXRRSET_RESULT(result))
-                       goto aaaa;
-               else {
-                       wanted_fetches |= DNS_ADBFIND_INET6;
-                       goto fetch;
-               }
 
-           aaaa:
                result = dbfind_name(adbname, now, dns_rdatatype_aaaa);
                if (result == ISC_R_SUCCESS) {
                        DP(DEF_LEVEL,