From 61896e829cd43530710eb9642f10dd2d7c557526 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 28 Mar 2017 10:48:38 -0700 Subject: [PATCH] GUACAMOLE-257: Set VNC/SSH file upload handlers only if SFTP is enabled. --- src/protocols/ssh/user.c | 3 ++- src/protocols/vnc/user.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/protocols/ssh/user.c b/src/protocols/ssh/user.c index 24d0fbb1..a697051b 100644 --- a/src/protocols/ssh/user.c +++ b/src/protocols/ssh/user.c @@ -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; /* 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; } diff --git a/src/protocols/vnc/user.c b/src/protocols/vnc/user.c index 3786c271..7e123732 100644 --- a/src/protocols/vnc/user.c +++ b/src/protocols/vnc/user.c @@ -98,7 +98,8 @@ int guac_vnc_user_join_handler(guac_user* user, int argc, char** argv) { #ifdef ENABLE_COMMON_SSH /* 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 }