From: Evan Hunt <each@isc.org>
Date: Thu, 3 Dec 2015 03:05:46 +0000 (-0800)
Subject: [master] update to previous commit: also list chrootdir if applicable
X-Git-Tag: v9.11.0a1~295
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8f918a34d1d950f3f6ccd50b1ae35040eb0c0ef5;p=thirdparty%2Fbind9.git

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

diff --git a/bin/named/server.c b/bin/named/server.c
index 39381418511..7ef8488ff4c 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