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

fix freerdp_client_settings_post_processing

Browse Source
This commit is contained in:
Bernhard Miklautz 2014-07-28 17:52:40 +02:00
parent 6812383d05
commit f06490b426
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
client/common/client.c
View File

@ -102,6 +102,38 @@ HANDLE freerdp_client_get_thread(rdpContext* context)
return ((rdpClientContext*) context)->thread;
}
static BOOL freerdp_client_settings_post_process(rdpSettings* settings)
{
/* Moved GatewayUseSameCredentials logic outside of cmdline.c, so
* that the rdp file also triggers this functionality */
if (settings->GatewayEnabled)
{
if (settings->GatewayUseSameCredentials)
{
if (settings->Username)
{
settings->GatewayUsername = _strdup(settings->Username);
if (!settings->GatewayUsername)
return FALSE;
}
if (settings->Domain)
{
settings->GatewayDomain = _strdup(settings->Domain);
if (!settings->GatewayDomain)
return FALSE;
}
if (settings->Password)
{
settings->GatewayPassword = _strdup(settings->Password);
if (!settings->GatewayPassword)
return FALSE;
}
}
}
return TRUE;
}
int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc, char** argv)
{
int status;
@ -124,35 +156,18 @@ int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc,
status = freerdp_client_settings_parse_assistance_file(settings, settings->AssistanceFile);
}
/* Only call post processing if no status/error was returned*/
if (status < 0)
return status;
/* This function will call logic that is applicable to the settings
* from command line parsing AND the rdp file parsing */
status = freerdp_client_combined_logic(settings);
if(!freerdp_client_settings_post_process(settings))
return -1;
return status;
}
int freerdp_client_combined_logic(rdpSettings* settings)
{
/* Moved GatewayUseSameCredentials logic outside of cmdline.c, so
* that the rdp file also triggers this functionality */
if (settings->GatewayEnabled)
{
if (settings->GatewayUseSameCredentials)
{
if (settings->Username)
settings->GatewayUsername = _strdup(settings->Username);
if (settings->Domain)
settings->GatewayDomain = _strdup(settings->Domain);
if (settings->Password)
settings->GatewayPassword = _strdup(settings->Password);
}
}
return 0;
}
int freerdp_client_settings_parse_connection_file(rdpSettings* settings, const char* filename)
{
rdpFile* file;