From: Joachim Meyer <joachim@joameyer.de>
Date: Mon, 7 Jan 2019 09:38:55 +0000 (+0100)
Subject: Set the username setting again, if it exists.
X-Git-Tag: 2.0.0~568^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7efbae282ce00d5ac24c40c9b552ee11c4d07773;p=platform%2Fupstream%2Ffreerdp.git

Set the username setting again, if it exists.
---

diff --git a/libfreerdp/common/assistance.c b/libfreerdp/common/assistance.c
index 189734f..9b6b618 100644
--- a/libfreerdp/common/assistance.c
+++ b/libfreerdp/common/assistance.c
@@ -1098,6 +1098,12 @@ BOOL freerdp_assistance_populate_settings_from_assistance_file(rdpAssistanceFile
 	if (freerdp_set_param_string(settings, FreeRDP_RemoteAssistancePassword, file->password) != 0)
 		return FALSE;
 
+	if (file->Username)
+	{
+		if (freerdp_set_param_string(settings, FreeRDP_Username, file->Username) != 0)
+			return FALSE;
+	}
+
 	settings->RemoteAssistanceMode = TRUE;
 	freerdp_set_param_uint32(settings, FreeRDP_ServerPort, file->MachinePorts[0]);
 	freerdp_target_net_addresses_free(settings);