mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shadow: fix WDS connectivity

Browse Source
This commit is contained in:
Marc-André Moreau 2014-08-15 14:15:53 -04:00
parent df146fe70d
commit 0457a29f57
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfreerdp/core/info.c
View File

@ -503,8 +503,16 @@ void rdp_write_info_packet(wStream* s, rdpSettings* settings)
}
else
{
/* This field MUST be filled with "*" */
cbAlternateShell = ConvertToUnicode(CP_UTF8, 0, "*", -1, &alternateShellW, 0) * 2;
if (settings->RemoteAssistancePassStub)
{
/* This field MUST be filled with "*" */
cbAlternateShell = ConvertToUnicode(CP_UTF8, 0, "*", -1, &alternateShellW, 0) * 2;
}
else
{
/* This field must contain the remote assistance password */
cbAlternateShell = ConvertToUnicode(CP_UTF8, 0, settings->RemoteAssistancePassword, -1, &alternateShellW, 0) * 2;
}
}
if (!settings->RemoteAssistanceMode)

10
server/shadow/Win/win_wds.c
View File

@ -747,12 +747,6 @@ int win_shadow_wds_init(winShadowSubsystem* subsystem)
printf("ConnectionString: %s\n", file->ConnectionString2);
printf("RemoteAssistanceSessionId: %s\n", file->RASessionId);
printf("RemoteAssistanceRCTicket: %s\n", file->RCTicket);
printf("RemoteAssistancePassStub: %s\n", file->PassStub);
printf("RemoteAssistanceMachineAddress: %s\n", file->MachineAddress);
printf("RemoteAssistanceMachinePort: %d\n", file->MachinePort);
if (1)
{
FILE* fp;
@ -785,10 +779,10 @@ int win_shadow_wds_init(winShadowSubsystem* subsystem)
freerdp_set_param_string(settings, FreeRDP_RemoteAssistanceRCTicket, file->ConnectionString2);
freerdp_set_param_string(settings, FreeRDP_RemoteAssistancePassStub, "Shadow123!");
freerdp_set_param_string(settings, FreeRDP_Domain, "RDP");
freerdp_set_param_string(settings, FreeRDP_Username, "Shadow");
freerdp_set_param_string(settings, FreeRDP_RemoteAssistancePassword, "Shadow123!");
freerdp_set_param_bool(settings, FreeRDP_AutoLogonEnabled, TRUE);
freerdp_set_param_string(settings, FreeRDP_ServerHostname, file->MachineAddress);
freerdp_set_param_uint32(settings, FreeRDP_ServerPort, file->MachinePort);