From: Francis Dupont <fdupont@isc.org>
Date: Tue, 9 Jun 2015 07:43:49 +0000 (+0200)
Subject: [3513] improved extended version layouts
X-Git-Tag: trac3513_beforeW~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=103e50f63a5b550dac08c75753b990befe462512;p=thirdparty%2Fkea.git

[3513] improved extended version layouts
---

diff --git a/src/bin/d2/d_controller.cc b/src/bin/d2/d_controller.cc
index 7711c8dea1..11d0e3efcb 100644
--- a/src/bin/d2/d_controller.cc
+++ b/src/bin/d2/d_controller.cc
@@ -458,9 +458,9 @@ isc::dhcp::Daemon::getVersion(bool extended) {
     tmp << VERSION;
     if (extended) {
         tmp << std::endl << EXTENDED_VERSION << std::endl;
-        tmp << "linked with " << isc::log::Logger::getVersion() << std::endl;
-        tmp << "and " << isc::cryptolink::CryptoLink::getVersion()
-            << std::endl;
+        tmp << "linked with:" << std::endl;
+        tmp << isc::log::Logger::getVersion() << std::endl;
+        tmp << isc::cryptolink::CryptoLink::getVersion() << std::endl;
 #ifdef HAVE_MYSQL
         tmp << "database: MySQL";
 #else
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 8190388d39..3f7a2d8937 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -2221,8 +2221,9 @@ Daemon::getVersion(bool extended) {
     tmp << VERSION;
     if (extended) {
         tmp << endl << EXTENDED_VERSION << endl;
-        tmp << "linked with " << Logger::getVersion() << endl;
-        tmp << "and " << CryptoLink::getVersion() << endl;
+        tmp << "linked with:" << endl;
+        tmp << Logger::getVersion() << endl;
+        tmp << CryptoLink::getVersion() << endl;
 #ifdef HAVE_MYSQL
         tmp << "database: MySQL";
 #else
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 1058dd6887..ea819bf7d8 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -2768,8 +2768,9 @@ Daemon::getVersion(bool extended) {
     tmp << VERSION;
     if (extended) {
         tmp << endl << EXTENDED_VERSION << endl;
-        tmp << "linked with " << Logger::getVersion() << endl;
-        tmp << "and " << CryptoLink::getVersion() << endl;
+        tmp << "linked with:" << endl;
+        tmp << Logger::getVersion() << endl;
+        tmp << CryptoLink::getVersion() << endl;
 #ifdef HAVE_MYSQL
         tmp << "database: MySQL";
 #else