From: Evan Hunt <each@isc.org>
Date: Fri, 28 Feb 2014 01:55:04 +0000 (-0800)
Subject: [master] log when using rndc.key
X-Git-Tag: v9.10.0b2~80
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=368aedf188d7c7782cae8a5ce2a978be47b5a764;p=thirdparty%2Fbind9.git

[master] log when using rndc.key

3767.	[func]		Log explicitly when using rndc.key to configure
			command channel. [RT #35316]
---

diff --git a/CHANGES b/CHANGES
index d6a1716bf5d..1208bffc6bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3767.	[func]		Log explicitly when using rndc.key to configure
+			command channel. [RT #35316]
+
 3766.	[cleanup]	Fixed problems with building outside the source
 			tree when using native PKCS#11. [RT #35459]
 
@@ -1480,7 +1483,7 @@
 			     when queryperf is available.
 			 - the encoding of PASSTHRU action to "rpz-passthru".
 			     (The old encoding is still accepted.)
-		       [RT #26172]
+			[RT #26172]
 
 
 3329.	[bug]		Handle RRSIG signer-name case consistently: We
diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 02acb4ea029..765afdd9662 100644
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -24,6 +24,7 @@
 #include <isc/base64.h>
 #include <isc/buffer.h>
 #include <isc/event.h>
+#include <isc/file.h>
 #include <isc/mem.h>
 #include <isc/net.h>
 #include <isc/netaddr.h>
@@ -823,6 +824,13 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
 	unsigned int algtype;
 	isc_buffer_t b;
 
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+		      NS_LOGMODULE_CONTROL, ISC_LOG_INFO,
+		      "configuring command channel from '%s'",
+		      ns_g_keyfile);
+	if (! isc_file_exists(ns_g_keyfile))
+		return (ISC_R_FILENOTFOUND);
+
 	CHECK(cfg_parser_create(mctx, ns_g_lctx, &pctx));
 	CHECK(cfg_parse_file(pctx, ns_g_keyfile, &cfg_type_rndckey, &config));
 	CHECK(cfg_map_get(config, "key", &key));