Browse Source

[3513] improved extended version layouts

Francis Dupont 10 years ago
parent
commit
103e50f63a
3 changed files with 9 additions and 7 deletions
  1. 3 3
      src/bin/d2/d_controller.cc
  2. 3 2
      src/bin/dhcp4/dhcp4_srv.cc
  3. 3 2
      src/bin/dhcp6/dhcp6_srv.cc

+ 3 - 3
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

+ 3 - 2
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

+ 3 - 2
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