mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using last @ for domain split. 

Command line parser splits username after
parsing all options.
This commit is contained in:
Armin Novak 2015-06-18 11:35:22 +02:00
parent 3e26940547
commit 64529b6d60
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client/common/cmdline.c
View File

@ -553,7 +553,7 @@ static char** freerdp_command_line_parse_comma_separated_values_offset(char* lis
return NULL;
p = t;
if (count > 0)
MoveMemory(&p[1], p, sizeof(char*) * *count);
MoveMemory(&p[1], p, sizeof(char*) * *count);
(*count)++;
return p;
@ -799,7 +799,7 @@ int freerdp_parse_username(char* username, char** user, char** domain)
int length = 0;
p = strchr(username, '\\');
u = strchr(username, '@');
u = strrchr(username, '@');
if (p)
{
@ -1229,6 +1229,8 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
int argc, char** argv, BOOL allowUnknown)
{
char* p;
char* user = NULL;
char* gwUser = NULL;
char* str;
int length;
int status;
@ -1490,13 +1492,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
}
CommandLineSwitchCase(arg, "u")
{
char* user;
char* domain;
freerdp_parse_username(arg->Value, &user, &domain);
settings->Username = user;
settings->Domain = domain;
user = _strdup(arg->Value);
}
CommandLineSwitchCase(arg, "d")
{
@ -1537,14 +1533,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
}
CommandLineSwitchCase(arg, "gu")
{
char* user;
char* domain;
freerdp_parse_username(arg->Value, &user, &domain);
settings->GatewayUsername = user;
settings->GatewayDomain = domain;
gwUser = _strdup(arg->Value);
settings->GatewayUseSameCredentials = FALSE;
}
CommandLineSwitchCase(arg, "gd")
@ -2049,6 +2038,19 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
}
while ((arg = CommandLineFindNextArgumentA(arg)) != NULL);
if (!settings->Domain && user)
{
freerdp_parse_username(arg->Value, &settings->Username, &settings->Domain);
free(user);
}
if (!settings->GatewayDomain && gwUser)
{
freerdp_parse_username(arg->Value, &settings->GatewayUsername,
&settings->GatewayDomain);
free(gwUser);
}
freerdp_performance_flags_make(settings);
if (settings->SupportGraphicsPipeline)