log the remaining -V info at startup

diff --git a/CHANGES b/CHANGES
index 8c5972735ec6725c2ad14a15bc676c455df27cd9..6bb2dddaf685495e03c3d5eb8a8c10820a20ef65 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4977.  [func]          When starting up, log the same details that
+                       would be reported by 'named -V'. [GL #247]
+
 4975.  [bug]           The server cookie computation for sha1 and sha256 did
                        not match the method described in RFC 7873. [GL #356]
 

diff --git a/bin/named/main.c b/bin/named/main.c
index 1227ea911fe5ea03cb6ab689baaf5a9af89336c4..10744f97ec6dd7bc8395f90a86bd7e9589332285 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1076,6 +1076,85 @@ setup(void) {
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
                      ISC_LOG_NOTICE, "running as: %s%s",
                      program_name, saved_command_line);
+#ifdef __clang__
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled by CLANG %s", __VERSION__);
+#else
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled by ICC %s", __VERSION__);
+#else
+#ifdef __GNUC__
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled by GCC %s", __VERSION__);
+#endif
+#endif
+#endif
+#ifdef _MSC_VER
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled by MSVC %d", _MSC_VER);
+#endif
+#ifdef __SUNPRO_C
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled by Solaris Studio %x", __SUNPRO_C);
+#endif
+#ifdef OPENSSL
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled with OpenSSL version: %s",
+                     OPENSSL_VERSION_TEXT);
+#if !defined(LIBRESSL_VERSION_NUMBER) && \
+    OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 or higher */
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "linked to OpenSSL version: %s",
+                     OpenSSL_version(OPENSSL_VERSION));
+#else
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "linked to OpenSSL version: %s",
+                     SSLeay_version(SSLEAY_VERSION));
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+#endif
+#ifdef HAVE_LIBXML2
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled with libxml2 version: %s",
+                     LIBXML_DOTTED_VERSION);
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "linked to libxml2 version: %s", xmlParserVersion);
+#endif
+#if defined(HAVE_JSON) && defined(JSON_C_VERSION)
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled with libjson-c version: %s", JSON_C_VERSION);
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "linked to libjson-c version: %s", json_c_version());
+#endif
+#if defined(HAVE_ZLIB) && defined(ZLIB_VERSION)
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "compiled with zlib version: %s", ZLIB_VERSION);
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "linked to zlib version: %s", zlibVersion());
+#endif
+#ifdef ISC_PLATFORM_USETHREADS
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "threads support is enabled");
+#else
+       isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+                     NS_LOGMODULE_MAIN, ISC_LOG_NOTICE,
+                     "threads support is disabled");
+#endif
 
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
                      ISC_LOG_NOTICE,