From a22f967b7e3589dab640d2cc65fd202d077a9d90 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 22 Apr 2003 04:08:54 +0000
Subject: [PATCH] 1469.   [func]          Log end of outgoing zone transfer at
 same level                         as the start of transfer is logged. [RT
 #4441]

---
 CHANGES            | 3 +++
 bin/named/xfrout.c | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0d4df2d126..21289667de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1469.	[func]		Log end of outgoing zone transfer at same level
+			as the start of transfer is logged. [RT #4441]
+
 1468.	[func]		Internal zones are no longer counted for
 			'rndc status'.  [RT #4706]
 
diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 5654f26099..2f0b213c0d 100644
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.112 2003/04/17 05:40:44 marka Exp $ */
+/* $Id: xfrout.c,v 1.113 2003/04/22 04:08:54 marka Exp $ */
 
 #include <config.h>
 
@@ -829,6 +829,7 @@ typedef struct {
 	isc_boolean_t		many_answers;
 	int			sends;		/* Send in progress */
 	isc_boolean_t		shuttingdown;
+	const char		*mnemonic;	/* Style of transfer */
 } xfrout_ctx_t;
 
 static isc_result_t
@@ -1139,6 +1140,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) {
 				(format == dns_many_answers) ?
 					ISC_TRUE : ISC_FALSE,
 				&xfr));
+	xfr->mnemonic = mnemonic;
 	stream = NULL;
 	db = NULL;
 	ver = NULL;
@@ -1236,6 +1238,7 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id,
 	xfr->many_answers = many_answers,
 	xfr->sends = 0;
 	xfr->shuttingdown = ISC_FALSE;
+	xfr->mnemonic = NULL;
 
 	/*
 	 * Allocate a temporary buffer for the uncompressed response
@@ -1619,8 +1622,7 @@ xfrout_senddone(isc_task_t *task, isc_event_t *event) {
 		sendstream(xfr);
 	} else {
 		/* End of zone transfer stream. */
-		xfrout_log(xfr, ISC_LOG_DEBUG(6),
-			   "end of transfer");
+		xfrout_log(xfr, ISC_LOG_INFO, "%s ended", xfr->mnemonic);
 		ns_client_next(xfr->client, ISC_R_SUCCESS);
 		xfrout_ctx_destroy(&xfr);
 	}