From: Evan Hunt <each@isc.org>
Date: Tue, 3 Nov 2015 04:13:13 +0000 (-0800)
Subject: [master] log TSIG key on xfrin
X-Git-Tag: v9.11.0a1~327^2~18
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=09f82f50798e170b172e6ba358ed123536243839;p=thirdparty%2Fbind9.git

[master] log TSIG key on xfrin

4250.	[func]		Log the TSIG key in use during inbound zone
			transfers. [RT #41075]
---

diff --git a/CHANGES b/CHANGES
index 9d6b88dd9bc..914afd9d00c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4250.	[func]		Log the TSIG key in use during inbound zone
+			transfers. [RT #41075]
+
 4249.	[func]		Improve error reporting of TSIG / SIG(0) records in
 			the wrong location. [RT #41030]
 
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 4781465168e..aeace4600e7 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -970,6 +970,8 @@ xfrin_connect_done(isc_task_t *task, isc_event_t *event) {
 	dns_xfrin_ctx_t *xfr = (dns_xfrin_ctx_t *) event->ev_arg;
 	isc_result_t result = cev->result;
 	char sourcetext[ISC_SOCKADDR_FORMATSIZE];
+	char signerbuf[DNS_NAME_FORMATSIZE];
+	const char *signer = "", *sep = "";
 	isc_sockaddr_t sockaddr;
 	dns_zonemgr_t * zmgr;
 	isc_time_t now;
@@ -1004,7 +1006,16 @@ xfrin_connect_done(isc_task_t *task, isc_event_t *event) {
 		isc_sockaddr_format(&sockaddr, sourcetext, sizeof(sourcetext));
 	} else
 		strcpy(sourcetext, "<UNKNOWN>");
-	xfrin_log(xfr, ISC_LOG_INFO, "connected using %s", sourcetext);
+
+	if (xfr->tsigkey != NULL && xfr->tsigkey->key != NULL) {
+		dns_name_format(dst_key_name(xfr->tsigkey->key),
+				signerbuf, sizeof(signerbuf));
+		sep = " TSIG ";
+		signer = signerbuf;
+	}
+
+	xfrin_log(xfr, ISC_LOG_INFO, "connected using %s%s%s",
+		  sourcetext, sep, signer);
 
 	dns_tcpmsg_init(xfr->mctx, xfr->socket, &xfr->tcpmsg);
 	xfr->tcpmsg_valid = ISC_TRUE;