From bcbf382de15f749c0e8531b67ee095f3b97eb4ba Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Tue, 11 Dec 2018 17:03:48 +0100
Subject: [PATCH] console: corrected handshake strings

- removed trailing \n in response messages
- changed welcome text "You are logged in as / using .."
---
 core/src/console/console.cc           | 2 ++
 core/src/dird/authenticate_console.cc | 9 +++++++--
 core/src/lib/bnet.cc                  | 1 -
 core/src/tests/bsock_test.cc          | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/src/console/console.cc b/core/src/console/console.cc
index 3afef71da1d..78056c7bce8 100644
--- a/core/src/console/console.cc
+++ b/core/src/console/console.cc
@@ -1135,6 +1135,7 @@ int main(int argc, char *argv[])
 
    if (response_id == kMessageIdOk) {
      ConsoleOutput(response_args.JoinReadable().c_str());
+     ConsoleOutput("\n");
    }
 
    response_args.clear();
@@ -1151,6 +1152,7 @@ int main(int argc, char *argv[])
    }
    response_args.PopFront();
    ConsoleOutput(response_args.JoinReadable().c_str());
+   ConsoleOutput("\n");
 
    Dmsg0(40, "Opened connection with Director daemon\n");
 
diff --git a/core/src/dird/authenticate_console.cc b/core/src/dird/authenticate_console.cc
index 0ae590a84a1..c01e32cd611 100644
--- a/core/src/dird/authenticate_console.cc
+++ b/core/src/dird/authenticate_console.cc
@@ -233,8 +233,13 @@ bool AuthenticateConsole(UaContext *ua)
       }
     }
   }
-  std::string message{"You are logged in as: "};
-  message += ua->cons ? ua->cons->name() : "root";
+  std::string message{"You are "};
+  if (ua->cons) {
+    message += "logged in as: ";
+    message += ua->cons->name();
+  } else {
+    message += "connected using the default console";
+  }
   ua->UA_sock->FormatAndSendResponseMessage(kMessageIdInfoMessage, message);
   return true;
 }
diff --git a/core/src/lib/bnet.cc b/core/src/lib/bnet.cc
index 1388124c9cd..bbd1ceaf3c4 100644
--- a/core/src/lib/bnet.cc
+++ b/core/src/lib/bnet.cc
@@ -674,7 +674,6 @@ bool BareosSocket::FormatAndSendResponseMessage(uint32_t id, const std::string &
 {
   BStringList message;
   message << str;
-  message << "\n";
 
   return FormatAndSendResponseMessage(id, message);
 }
diff --git a/core/src/tests/bsock_test.cc b/core/src/tests/bsock_test.cc
index 00d00d3bf81..ae3fadce8b9 100644
--- a/core/src/tests/bsock_test.cc
+++ b/core/src/tests/bsock_test.cc
@@ -469,7 +469,7 @@ TEST(BNet, FormatAndSendResponseMessage)
   EXPECT_TRUE(ok) << "ReceiveAndEvaluateResponseMessage errored.";
   EXPECT_EQ(id, kMessageIdOk) << "Wrong MessageID received.";
 
-  std::string test("1000 Test123 \n");
+  std::string test("1000 Test123");
   EXPECT_STREQ(args.JoinReadable().c_str(), test.c_str());
 }