This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit a1c382c8ce3acb9c504bfa969f09bf0151f62fd4 Merge: 652ca30 8b53be4 Author: Michael Jumper <[email protected]> AuthorDate: Tue Apr 30 17:26:21 2019 -0700 Merge 1.1.0 changes back to master. src/libguac/guacamole/protocol.h | 14 ++ src/libguac/guacamole/user.h | 9 +- src/libguac/protocol.c | 5 + src/libguac/user-handlers.c | 145 ++++++++++++++++++++ src/libguac/user-handlers.h | 102 +++++++++++++++ src/libguac/user-handshake.c | 255 ++++++++++++++---------------------- src/libguac/user.c | 15 +-- src/protocols/kubernetes/settings.c | 2 +- src/protocols/rdp/rdp_settings.c | 6 +- src/protocols/ssh/settings.c | 4 +- src/protocols/telnet/settings.c | 2 +- src/protocols/vnc/settings.c | 2 +- 12 files changed, 382 insertions(+), 179 deletions(-) diff --cc src/protocols/ssh/settings.c index 8436419,a0af9f9..7dab321 --- a/src/protocols/ssh/settings.c +++ b/src/protocols/ssh/settings.c @@@ -437,21 -421,11 +437,21 @@@ guac_ssh_settings* guac_ssh_parse_args( guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv, IDX_LOCALE, NULL); - /* Read the client timezone. */ + /* Read the timezone parameter, or use client handshake. */ settings->timezone = guac_user_parse_args_string(user, GUAC_SSH_CLIENT_ARGS, argv, - IDX_TIMEZONE, NULL); + IDX_TIMEZONE, user->info.timezone); + /* Parse clipboard copy disable flag */ + settings->disable_copy = + guac_user_parse_args_boolean(user, GUAC_SSH_CLIENT_ARGS, argv, + IDX_DISABLE_COPY, false); + + /* Parse clipboard paste disable flag */ + settings->disable_paste = + guac_user_parse_args_boolean(user, GUAC_SSH_CLIENT_ARGS, argv, + IDX_DISABLE_PASTE, false); + /* Parsing was successful */ return settings;
