Repository: incubator-guacamole-server Updated Branches: refs/heads/master 114f5b23e -> aba2b46a7
GUACAMOLE-257: Set VNC/SSH file upload handlers only if SFTP is enabled. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/61896e82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/61896e82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/61896e82 Branch: refs/heads/master Commit: 61896e829cd43530710eb9642f10dd2d7c557526 Parents: 039a1c5 Author: Michael Jumper <[email protected]> Authored: Tue Mar 28 10:48:38 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Tue Mar 28 10:48:38 2017 -0700 ---------------------------------------------------------------------- src/protocols/ssh/user.c | 3 ++- src/protocols/vnc/user.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/61896e82/src/protocols/ssh/user.c ---------------------------------------------------------------------- diff --git a/src/protocols/ssh/user.c b/src/protocols/ssh/user.c index 24d0fbb..a697051 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; } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/61896e82/src/protocols/vnc/user.c ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/user.c b/src/protocols/vnc/user.c index 3786c27..7e12373 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 }
