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

GUACAMOLE-422: Support timezone redirection in RDP via TZ variable.

Browse Source
This commit is contained in:
Nick Couchman 2018-04-10 21:31:50 -04:00
parent 381c5d1a76
commit ffdc98d024
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/protocols/rdp/rdp_settings.c
View File

@ -79,6 +79,7 @@ const char* GUAC_RDP_CLIENT_ARGS[] = {
"disable-glyph-caching", "disable-glyph-caching",
"preconnection-id", "preconnection-id",
"preconnection-blob", "preconnection-blob",
"timezone",
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
"enable-sftp", "enable-sftp",
@ -356,6 +357,11 @@ enum RDP_ARGS_IDX {
*/ */
IDX_PRECONNECTION_BLOB, IDX_PRECONNECTION_BLOB,
/**
* The timezone to pass through to the RDP connection.
*/
IDX_TIMEZONE,
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
/** /**
* "true" if SFTP should be enabled for the RDP connection, "false" or * "true" if SFTP should be enabled for the RDP connection, "false" or
@ -840,6 +846,11 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
if (settings->server_layout == NULL) if (settings->server_layout == NULL)
settings->server_layout = guac_rdp_keymap_find(GUAC_DEFAULT_KEYMAP); settings->server_layout = guac_rdp_keymap_find(GUAC_DEFAULT_KEYMAP);
/* Timezone if provied by client */
settings->timezone =
guac_user_parse_args_string(user, GUAC_RDP_CLIENT_ARGS, argv,
IDX_TIMEZONE, NULL);
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
/* SFTP enable/disable */ /* SFTP enable/disable */
settings->enable_sftp = settings->enable_sftp =
@ -1013,6 +1024,7 @@ void guac_rdp_settings_free(guac_rdp_settings* settings) {
free(settings->remote_app); free(settings->remote_app);
free(settings->remote_app_args); free(settings->remote_app_args);
free(settings->remote_app_dir); free(settings->remote_app_dir);
free(settings->timezone);
free(settings->username); free(settings->username);
free(settings->printer_name); free(settings->printer_name);
@ -1265,6 +1277,9 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
#endif #endif
/* Device redirection */ /* Device redirection */
if (guac_settings->timezone)
setenv("TZ", guac_settings->timezone, 1);
#ifdef LEGACY_RDPSETTINGS #ifdef LEGACY_RDPSETTINGS
#ifdef HAVE_RDPSETTINGS_DEVICEREDIRECTION #ifdef HAVE_RDPSETTINGS_DEVICEREDIRECTION
rdp_settings->device_redirection = guac_settings->audio_enabled rdp_settings->device_redirection = guac_settings->audio_enabled

5
src/protocols/rdp/rdp_settings.h
View File

@ -341,6 +341,11 @@ typedef struct guac_rdp_settings {
*/ */
char* preconnection_blob; char* preconnection_blob;
/**
* The timezone to pass through to the RDP connection.
*/
char* timezone;
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
/** /**
* Whether SFTP should be enabled for the VNC connection. * Whether SFTP should be enabled for the VNC connection.