GUACAMOLE-257: Merge sftp file upload handler fix.

This commit is contained in:
James Muehlner 2017-03-29 11:33:34 -07:00
commit aba2b46a7c
2 changed files with 4 additions and 2 deletions

View File

@ -87,7 +87,8 @@ int guac_ssh_user_join_handler(guac_user* user, int argc, char** argv) {
user->size_handler = guac_ssh_user_size_handler; user->size_handler = guac_ssh_user_size_handler;
/* Set generic (non-filesystem) file upload handler */ /* Set generic (non-filesystem) file upload handler */
user->file_handler = guac_sftp_file_handler; if (settings->enable_sftp)
user->file_handler = guac_sftp_file_handler;
} }

View File

@ -98,7 +98,8 @@ int guac_vnc_user_join_handler(guac_user* user, int argc, char** argv) {
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
/* Set generic (non-filesystem) file upload handler */ /* Set generic (non-filesystem) file upload handler */
user->file_handler = guac_vnc_sftp_file_handler; if (settings->enable_sftp)
user->file_handler = guac_vnc_sftp_file_handler;
#endif #endif
} }