[master] update to previous commit: also list chrootdir if applicable

diff --git a/bin/named/server.c b/bin/named/server.c
index 3938141851112ee3327ecd28c7b26b4ccb63158c..7ef8488ff4c5e276031cb7f34a28dd780dda36cc 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8939,7 +8939,13 @@ 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);
+       if (ns_g_chrootdir != NULL) {
+               snprintf(line, sizeof(line), "configuration file: %s (%s%s)\n",
+                        ns_g_conffile, ns_g_chrootdir, ns_g_conffile);
+       } else {
+               snprintf(line, sizeof(line), "configuration file: %s\n",
+                        ns_g_conffile);
+       }
        CHECK(putstr(text, line));
 
 #ifdef ISC_PLATFORM_USETHREADS