pullup:

 715.   [bug]           Resolving some A6 chains could cause an assertion
                        failure in adb.c. [RT #738]

diff --git a/CHANGES b/CHANGES
index ae699b5056213e7f70191fa5df4598c3c6909e7d..184cf30a294754c1b90b6146936ff1a91c53ce11 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@
                        reference an uninitialized variable, causing the
                        server to crash. [RT #750]
 
+ 715.  [bug]           Resolving some A6 chains could cause an assertion
+                       failure in adb.c. [RT #738]
+
  711.  [bug]           The libisc and liblwres implementations of
                        inet_ntop contained an off by one error.
 

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 7e3d282dda47b8789beb8666a8b30862008ac630..6949a2521bc5848e3bda799a1f502c60ad90ce79 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.1 2001/01/09 22:43:22 bwelling Exp $ */
+/* $Id: adb.c,v 1.162.2.2 2001/01/30 22:26:09 gson Exp $ */
 
 /*
  * Implementation notes
@@ -3303,6 +3303,7 @@ dbfind_a6(dns_adbname_t *adbname, isc_stdtime_t now) {
                dns_a6_init(&a6ctx, a6find, NULL, import_a6,
                            a6missing, adbname);
                (void)dns_a6_foreach(&a6ctx, &rdataset, now);
+               adbname->flags &= ~NAME_NEEDS_POKE;
                result = ISC_R_SUCCESS;
                break;
        case DNS_R_NXDOMAIN: