From: Mark Andrews <marka@isc.org>
Date: Thu, 24 May 2007 01:43:22 +0000 (+0000)
Subject: 2194.   [bug]           Close journal before calling 'done' in xfrin.c.
X-Git-Tag: v9.4.0rc1^2~4
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4559465f759fdfea190efafc9fac23811a0ded4b;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 7d160b7c306..e270cddda17 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 bec8501bd10..5d957c6c12f 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.135.18.11 2006/07/19 00:58:01 marka Exp $ */
+/* $Id: xfrin.c,v 1.135.18.12 2007/05/24 01:43:22 marka Exp $ */
 
 /*! \file */
 
@@ -1303,6 +1303,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.
 		 */