[v9_10] fixed library version reporting

- forgot to include a CHANGES note
- disabled on windows (it fails to link)

diff --git a/CHANGES b/CHANGES
index 13c56615264acb370230946dd659ab449bc6825c..36ab823ae938a21aaadaf49bc6046614bafa890d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
        --- 9.10.2rc1 released ---
 
+4047.  [cleanup]       "named -V" now reports the current running versions
+                       of OpenSSL and the libxml2 libraries, in addition to
+                       the versions that were in use at build time.
+
 4046.  [bug]           Accounting of "total use" in memory context
                        statistics was not correct. [RT #38370]
 

diff --git a/bin/named/main.c b/bin/named/main.c
index 9187cbf89f86645adc78c8788a0dd9ffa5997734..64ebd6158b343e835f69560784686ec1a73bc6d6 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -605,14 +605,18 @@ parse_command_line(int argc, char *argv[]) {
 #ifdef OPENSSL
                        printf("compiled with OpenSSL version: %s\n",
                               OPENSSL_VERSION_TEXT);
+#ifndef WIN32
                        printf("linked to OpenSSL version: %s\n",
                               SSLeay_version(SSLEAY_VERSION));
 #endif
+#endif
 #ifdef HAVE_LIBXML2
                        printf("compiled with libxml2 version: %s\n",
                               LIBXML_DOTTED_VERSION);
+#ifndef WIN32
                        printf("linked to libxml2 version: %s\n",
                               xmlParserVersion);
+#endif
 #endif
                        exit(0);
                case 'F':