GUACAMOLE-527: Fix host key options in the protocol settings.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/2bebb968 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/2bebb968 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/2bebb968 Branch: refs/heads/staging/1.0.0 Commit: 2bebb96804f1bf6d0f573de53999f8ee8e368ef3 Parents: 551598e Author: Nick Couchman <vn...@apache.org> Authored: Thu May 24 09:24:48 2018 -0400 Committer: Nick Couchman <nick_couch...@cotyinc.com> Committed: Mon Jun 25 08:31:37 2018 -0400 ---------------------------------------------------------------------- src/protocols/rdp/rdp_settings.c | 1 - src/protocols/ssh/settings.c | 1 - src/protocols/vnc/settings.c | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/2bebb968/src/protocols/rdp/rdp_settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c index 2fe261c..0af6443 100644 --- a/src/protocols/rdp/rdp_settings.c +++ b/src/protocols/rdp/rdp_settings.c @@ -84,7 +84,6 @@ const char* GUAC_RDP_CLIENT_ARGS[] = { #ifdef ENABLE_COMMON_SSH "enable-sftp", "sftp-hostname", - "sftp-host-key-type", "sftp-host-key", "sftp-port", "sftp-username", http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/2bebb968/src/protocols/ssh/settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/ssh/settings.c b/src/protocols/ssh/settings.c index 4a1c371..7820cf6 100644 --- a/src/protocols/ssh/settings.c +++ b/src/protocols/ssh/settings.c @@ -32,7 +32,6 @@ /* Client plugin arguments */ const char* GUAC_SSH_CLIENT_ARGS[] = { "hostname", - "host-key-type", "host-key", "port", "username", http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/2bebb968/src/protocols/vnc/settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c index 130c97d..27524e1 100644 --- a/src/protocols/vnc/settings.c +++ b/src/protocols/vnc/settings.c @@ -63,6 +63,7 @@ const char* GUAC_VNC_CLIENT_ARGS[] = { #ifdef ENABLE_COMMON_SSH "enable-sftp", "sftp-hostname", + "sftp-host-key", "sftp-port", "sftp-username", "sftp-password",
