maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-422: SSH parameter should use handshake for default.

Browse Source
This commit is contained in:
Nick Couchman 2019-03-25 17:23:58 -04:00
parent 6fae0b4b23
commit 5caa8a25f7
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/protocols/ssh/settings.c
View File

@ -421,14 +421,10 @@ guac_ssh_settings* guac_ssh_parse_args(guac_user* user,
guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv, guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv,
IDX_LOCALE, NULL); IDX_LOCALE, NULL);
/* Read the client timezone. */ /* Read the timezone parameter, or use client handshake. */
settings->timezone = settings->timezone =
guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv, guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv,
IDX_TIMEZONE, NULL); IDX_TIMEZONE, user->info.timezone);
/* If timezone not explicitly set, try to pull from tunnel */
if (settings->timezone == NULL)
settings->timezone = user->info.timezone;
/* Parsing was successful */ /* Parsing was successful */
return settings; return settings;