From: Evan Hunt <each@isc.org>
Date: Thu, 3 Dec 2015 02:54:46 +0000 (-0800)
Subject: [master] add conf file to rndc status
X-Git-Tag: v9.11.0a1~296
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b6214feb63f48e9c08f16394ae5b6902b45b9c38;p=thirdparty%2Fbind9.git

[master] add conf file to rndc status

4268.	[func]		"rndc status" now reports the path to the
			configuration file. [RT #36470]
---

diff --git a/CHANGES b/CHANGES
index a58674d9569..febce4882db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4268.	[func]		"rndc status" now reports the path to the
+			configuration file. [RT #36470]
+
 4267.	[test]		Check sdlz error handling. [RT #41142]
 
 4266.	[placeholder]
diff --git a/bin/named/server.c b/bin/named/server.c
index 06559ec1e9e..39381418511 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8939,6 +8939,9 @@ ns_server_status(ns_server_t *server, isc_buffer_t **text) {
 	snprintf(line, sizeof(line), "last configured: %s\n", configtime);
 	CHECK(putstr(text, line));
 
+	snprintf(line, sizeof(line), "configuration file: %s\n", ns_g_conffile);
+	CHECK(putstr(text, line));
+
 #ifdef ISC_PLATFORM_USETHREADS
 	snprintf(line, sizeof(line), "CPUs found: %u\n", ns_g_cpus_detected);
 	CHECK(putstr(text, line));