From: Mark Andrews <marka@isc.org>
Date: Thu, 24 May 2007 01:51:38 +0000 (+0000)
Subject: 2194.   [bug]           Close journal before calling 'done' in xfrin.c.
X-Git-Tag: v9.2.0b1^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360af9de3d80803a1cd5d5282dd7f0a8aca0042a;p=thirdparty%2Fbind9.git

2194.   [bug]           Close journal before calling 'done' in xfrin.c.
---

diff --git a/CHANGES b/CHANGES
index ea82f7974b6..4085b4388c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2194.	[bug]		Close journal before calling 'done' in xfrin.c.
+
 2193.	[port]		win32: BINDInstall.exe is now linked statically.
 			[RT #16906]
 
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index fe5841f4970..924b3f93f81 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.124.2.13 2006/01/04 23:50:17 marka Exp $ */
+/* $Id: xfrin.c,v 1.124.2.14 2007/05/24 01:51:38 marka Exp $ */
 
 #include <config.h>
 
@@ -1243,6 +1243,11 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 		xfr->state = XFRST_INITIALSOA;
 		CHECK(xfrin_send_request(xfr));
 	} else if (xfr->state == XFRST_END) {
+		/*
+		 * Close the journal.
+		 */
+		if (xfr->ixfr.journal != NULL)
+			dns_journal_destroy(&xfr->ixfr.journal);
 		/*
 		 * Inform the caller we succeeded.
 		 */