From: Mark Andrews <marka@isc.org>
Date: Thu, 6 Sep 2001 00:20:49 +0000 (+0000)
Subject:  980.   [bug]           Incoming zone transfers restarting after an error
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=229d1708df75f8c9196a76762aa893b8c8b3cf47;p=thirdparty%2Fbind9.git

 980.   [bug]           Incoming zone transfers restarting after an error
                        could trigger an assertion failure. [RT #1692]
---

diff --git a/CHANGES b/CHANGES
index d22404ddca8..a4e15220359 100644
--- 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 e8f113c011d..49dc11df2cf 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.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);