Pass the username back from the daeamon so can tell who logged in as when using login prompt

1 files changed, 6 insertions, 3 deletions

diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp
index 6b4ca2e7..da8651c8 100644
--- a/liblightdm-qt/greeter.cpp
+++ b/liblightdm-qt/greeter.cpp
@@ -380,6 +380,9 @@ void Greeter::onRead(int fd)
     {
     case SERVER_MESSAGE_PROMPT_AUTHENTICATION:
         sequenceNumber = readInt(message, messageLength, &offset);
+        username = readString(message, messageLength, &offset);
+
+        d->authenticationUser = username;
 
         if (sequenceNumber == d->authenticateSequenceNumber &&
             !d->cancellingAuthentication)
@@ -412,16 +415,16 @@ void Greeter::onRead(int fd)
         break;
     case SERVER_MESSAGE_END_AUTHENTICATION:
         sequenceNumber = readInt(message, messageLength, &offset);
+        username = readString(message, messageLength, &offset);
         returnCode = readInt(message, messageLength, &offset);
 
         if (sequenceNumber == d->authenticateSequenceNumber)
         {
             qDebug() << "Authentication complete with return code " << returnCode;
+
             d->cancellingAuthentication = false;
             d->isAuthenticated = (returnCode == 0);
-            if(!d->isAuthenticated) {
-                d->authenticationUser = "";
-            }
+            d->authenticationUser = username;
             emit authenticationComplete();
             d->inAuthentication = false;
         }