GUACAMOLE-1122: Merge fix for build failure due to conditionally-missing variable declaration.

This commit is contained in:
Mike Jumper 2020-07-02 22:30:58 -07:00 committed by GitHub
commit 3fc3880f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -127,9 +127,9 @@ int guac_rdp_user_file_handler(guac_user* user, guac_stream* stream,
char* mimetype, char* filename) { char* mimetype, char* filename) {
guac_rdp_client* rdp_client = (guac_rdp_client*) user->client->data; guac_rdp_client* rdp_client = (guac_rdp_client*) user->client->data;
guac_rdp_settings* settings = rdp_client->settings;
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
guac_rdp_settings* settings = rdp_client->settings;
/* If SFTP is enabled and SFTP uploads have not been disabled, it should be /* If SFTP is enabled and SFTP uploads have not been disabled, it should be
* used for default uploads only if RDPDR is not enabled or its upload * used for default uploads only if RDPDR is not enabled or its upload