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

                        could trigger an assertion failure. [RT #1692]

diff --git a/CHANGES b/CHANGES
index d22404ddca8c73f2579907114a18250ae6f9e9c1..a4e15220359054d869b4536d942f31917661c324 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 980.  [bug]           Incoming zone transfers restarting after an error
+                       could trigger an assertion failure. [RT #1692]
+
  978.  [bug]           dns_db_attachversion() had an invalid REQUIRE()
                        condition.
 

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index e8f113c011d09c6e447c2ed00be288af9ea63b9e..49dc11df2cfb510d84e7304fb31a109bd8e7e44d 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.109.2.5 2001/06/07 19:02:00 gson Exp $ */
+/* $Id: xfrin.c,v 1.109.2.6 2001/09/06 00:20:49 marka Exp $ */
 
 #include <config.h>
 
@@ -634,8 +634,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);