4334. [func] 'named -V' now reports zlib version. [RT #41913]

diff --git a/CHANGES b/CHANGES
index a105c4ae61521a050b7926beb6f8b1f7201c857a..c931887030caafdbbc78eb80a2721635ccda5466 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4334.  [func]          'named -V' now reports zlib version. [RT #41913]
+
 4333.  [maint]         L.ROOT-SERVERS.NET is now 199.7.83.42 and
                        2001:500:9f::42.
 

diff --git a/bin/named/main.c b/bin/named/main.c
index 8d9c30b8269f953cb072b505f81d30a7eafed1dc..2b4e73e57c13df458e206a25f551b4fb138b6a57 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -87,6 +87,9 @@
 #ifdef HAVE_LIBXML2
 #include <libxml/xmlversion.h>
 #endif
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif
 /*
  * Include header files for database drivers here.
  */
@@ -677,6 +680,12 @@ parse_command_line(int argc, char *argv[]) {
                        printf("linked to libjson-c version: %s\n",
                               json_c_version());
 #endif
+#if defined(HAVE_ZLIB) && defined(ZLIB_VERSION)
+                       printf("compiled with zlib version: %s\n",
+                              ZLIB_VERSION);
+                       printf("linked to zlib version: %s\n",
+                              zlibVersion());
+#endif
 #ifdef ISC_PLATFORM_USETHREADS
                        printf("threads support is enabled\n");
 #else