[3882a] Updated extended version code

diff --git a/src/bin/d2/d_controller.cc b/src/bin/d2/d_controller.cc
index b55540d4c87b14dc3f22abb010ad7bef1cfeacb6..1cbd9aa5986f2ff01a09fbb3e0fbfab09bb4faee 100644 (file)
--- a/src/bin/d2/d_controller.cc
+++ b/src/bin/d2/d_controller.cc
@@ -474,12 +474,12 @@ DControllerBase::getVersion(bool extended) {
         tmp << isc::cryptolink::CryptoLink::getVersion() << std::endl;
         tmp << "database:" << std::endl; 
 #ifdef HAVE_MYSQL
-        tmp << "MySQL backend" << std::endl;
+        tmp << isc::dhcp::MySqlLeaseMgr::getDBVersion() << std::endl;
 #endif
 #ifdef HAVE_PGSQL
-        tmp << "PostgreSQL backend" << std::endl;
+        tmp << isc::dhcp::PgSqlLeaseMgr::getDBVersion() << std::endl;
 #endif
-        tmp << "Memfile backend";
+        tmp << isc::dhcp::Memfile_LeaseMgr::getDBVersion();
 
         // @todo: more details about database runtime
     }

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 9c49af1e86f8cd80f481697ec6c69c24f4c0d630..3e7bebb683490edbc6a33f84a532a7077540968d 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -2272,15 +2272,15 @@ Dhcpv4Srv::getVersion(bool extended) {
         tmp << "linked with:" << endl;
         tmp << Logger::getVersion() << endl;
         tmp << CryptoLink::getVersion() << endl;
+        tmp << "database:" << endl;
 #ifdef HAVE_MYSQL
-        tmp << "database: MySQL";
-#else
-#ifdef HAVE_PGSQL
-        tmp << "database: PostgreSQL";
-#else
-        tmp << "no database";
+        tmp << MySqlLeaseMgr::getDBVersion() << endl;
 #endif
+#ifdef HAVE_PGSQL
+        tmp << PgSqlLeaseMgr::getDBVersion() << endl;
 #endif
+        tmp << Memfile_LeaseMgr::getDBVersion();
+
         // @todo: more details about database runtime
     }
 

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index e5414a96314db083efd97f73666e8d1008ee33bd..90fb5e90c554cf93467497d3b3689e77dfd4c97e 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -2854,15 +2854,15 @@ Dhcpv6Srv::getVersion(bool extended) {
         tmp << "linked with:" << endl;
         tmp << Logger::getVersion() << endl;
         tmp << CryptoLink::getVersion() << endl;
+        tmp << "database:" << endl;
 #ifdef HAVE_MYSQL
-        tmp << "database: MySQL";
-#else
-#ifdef HAVE_PGSQL
-        tmp << "database: PostgreSQL";
-#else
-        tmp << "no database";
+        tmp << MySqlLeaseMgr::getDBVersion() << endl;
 #endif
+#ifdef HAVE_PGSQL
+        tmp << PgSqlLeaseMgr::getDBVersion() << endl;
 #endif
+        tmp << Memfile_LeaseMgr::getDBVersion();
+
         // @todo: more details about database runtime
     }