980. [bug] Incoming zone transfers restarting after an error

                        could trigger an assertion failure. [RT #1692]

diff --git a/CHANGES b/CHANGES
index 3e5db38e5ddd61cbbfde36ba27c9e4d3e58d4da1..b128ce5dc796f0cdea619714be0583e567d0615b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+ 980.  [bug]           Incoming zone transfers restarting after an error
+                       could trigger an assertion failure. [RT #1692]
+
+
        --- 9.2.0rc2 released ---
 
  978.  [bug]           dns_db_attachversion() had an invalid REQUIRE()

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 20039f438501cae74f0dcfcc2782206a5c0fa03f..fe1f5e5dc3432e7d97452360baaabda86677c989 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124 2001/08/08 22:54:46 gson Exp $ */
+/* $Id: xfrin.c,v 1.124.2.1 2001/09/06 00:23:19 marka Exp $ */
 
 #include <config.h>
 
@@ -647,8 +647,10 @@ xfrin_reset(dns_xfrin_ctx_t *xfr) {
        if (xfr->ixfr.journal != NULL)
                dns_journal_destroy(&xfr->ixfr.journal);
 
-       if (xfr->axfr.add_private != NULL)
+       if (xfr->axfr.add_private != NULL) {
                (void)dns_db_endload(xfr->db, &xfr->axfr.add_private);
+               xfr->axfr.add_func = NULL;
+       }
 
        if (xfr->tcpmsg_valid) {
                dns_tcpmsg_invalidate(&xfr->tcpmsg);