From 8f918a34d1d950f3f6ccd50b1ae35040eb0c0ef5 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 2 Dec 2015 19:05:46 -0800 Subject: [PATCH] [master] update to previous commit: also list chrootdir if applicable --- bin/named/server.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/named/server.c b/bin/named/server.c index 3938141851..7ef8488ff4 100644 --- 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