[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 a58674d9569a088cdd8644b2605ec39a6f3db6bf..febce4882dbeb44fc4b76a79dd383dcaf9ea63e9 100644 (file)
--- 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 06559ec1e9e6c0972c9723b2b2abbfa473ce65f9..3938141851112ee3327ecd28c7b26b4ccb63158c 100644 (file)
--- 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));