From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Wed, 5 Dec 2018 22:53:04 +0000 (+0100)
Subject: Update and re-sort feature list in --version output
X-Git-Tag: auth-4.2.0-alpha1~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7264%2Fhead;p=thirdparty%2Fpdns.git

Update and re-sort feature list in --version output
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 42d427ee73..0f4e70f919 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -1384,6 +1384,9 @@ public:
     g_log << Logger::Info << "[bind2backend] This is the bind backend version " << VERSION
 #ifndef REPRODUCIBLE
       << " (" __DATE__ " " __TIME__ ")"
+#endif
+#ifdef HAVE_SQLITE3
+      << " (with bind-dnssec-db support)"
 #endif
       << " reporting" << endl;
   }
diff --git a/pdns/version.cc b/pdns/version.cc
index 4c46bd8bdd..0ace0e58b9 100644
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -83,24 +83,50 @@ void showProductVersion()
 void showBuildConfiguration()
 {
   g_log<<Logger::Warning<<"Features: "<<
-#ifdef HAVE_LIBSODIUM
-    "sodium " <<
-#endif
 #ifdef HAVE_LIBDECAF
     "decaf " <<
 #endif
-    "openssl " <<
+#ifdef HAVE_BOOST_CONTEXT
+    "fcontext " <<
+#endif
+#ifdef HAVE_LIBCRYPTO_ECDSA
+    "libcrypto-ecdsa "
+#endif
+#ifdef HAVE_LIBCRYPTO_ED25519
+    "libcrypto-ed25519 "
+#endif
+#ifdef HAVE_LIBCRYPTO_ED448
+    "libcrypto-ed448 "
+#endif
+#ifdef HAVE_LIBCRYPTO_EDDSA
+    "libcrypto-eddsa "
+#endif
 #ifdef HAVE_LIBDL
     "libdl " <<
 #endif
 #ifdef HAVE_LUA
     "lua " <<
 #endif
+#ifdef HAVE_LUA_RECORDS
+    "lua-records " <<
+#endif
+#ifdef NOD_ENABLED
+    "nod " <<
+#endif
+#ifdef HAVE_P11KIT1
+    "PKCS#11 " <<
+#endif
+#ifdef HAVE_PROTOBUF
+    "protobuf " <<
+#endif
 #ifdef REMOTEBACKEND_ZEROMQ
     "remotebackend-zeromq " <<
 #endif
-#ifdef HAVE_P11KIT1
-    "PKCS#11" <<
+#ifdef HAVE_NET_SNMP
+    "snmp " <<
+#endif
+#ifdef HAVE_LIBSODIUM
+    "sodium " <<
 #endif
 #ifdef VERBOSELOG
     "verboselog" <<