diff --git a/CHANGES b/CHANGES index 5a41aef9f3..0c5f2baefb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ + + 980. [bug] Incoming zone transfers restarting after an error + could trigger an assertion failure. [RT #1692] + 979. [func] Incremental master file dumping. dns_master_dumpinc(), dns_master_dumptostreaminc(), dns_dumpctx_attach(), dns_dumpctx_detach(), dns_dumpctx_cancel(), diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 9cf81a4c1a..bd1eea8d5c 100644 --- 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.125 2001/08/30 05:12:39 marka Exp $ */ +/* $Id: xfrin.c,v 1.126 2001/09/05 23:02:28 gson Exp $ */ #include @@ -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);