GUACAMOLE-203: Change parameter name for consistency
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/193051df Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/193051df Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/193051df Branch: refs/heads/master Commit: 193051dfd534f18ef6d87b0359d2802daee6d195 Parents: 070bd25 Author: Nick Couchman <[email protected]> Authored: Wed Jun 14 08:40:07 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Wed Jun 14 08:40:07 2017 -0400 ---------------------------------------------------------------------- src/protocols/rdp/rdp_settings.c | 6 +++--- src/protocols/vnc/settings.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/193051df/src/protocols/rdp/rdp_settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c index 32c0941..2b6635f 100644 --- a/src/protocols/rdp/rdp_settings.c +++ b/src/protocols/rdp/rdp_settings.c @@ -84,7 +84,7 @@ const char* GUAC_RDP_CLIENT_ARGS[] = { "sftp-private-key", "sftp-passphrase", "sftp-directory", - "sftp-keepalive", + "sftp-server-alive-interval", #endif "recording-path", @@ -373,7 +373,7 @@ enum RDP_ARGS_IDX { * of 1 is automatically increased to 2 by libssh2 to avoid busy loop corner * cases. */ - IDX_SFTP_KEEPALIVE, + IDX_SFTP_SERVER_ALIVE_INTERVAL, #endif /** @@ -787,7 +787,7 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user, /* Default keepalive value */ settings->sftp_keepalive = guac_user_parse_args_int(user, GUAC_RDP_CLIENT_ARGS, argv, - IDX_SFTP_KEEPALIVE, 0); + IDX_SFTP_SERVER_ALIVE_INTERVAL, 0); if (settings->sftp_keepalive == 1) guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed " "value for keepalives by libssh2 is 2 seconds."); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/193051df/src/protocols/vnc/settings.c ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c index 60e2f61..a9e4228 100644 --- a/src/protocols/vnc/settings.c +++ b/src/protocols/vnc/settings.c @@ -66,7 +66,7 @@ const char* GUAC_VNC_CLIENT_ARGS[] = { "sftp-private-key", "sftp-passphrase", "sftp-directory", - "sftp-keepalive", + "sftp-server-alive-interval", #endif "recording-path", @@ -232,10 +232,10 @@ enum VNC_ARGS_IDX { /** * The interval at which SSH keepalive messages are sent to the server for * SFTP connections. The default is 0 (disabling keepalives), and a value - * of 1 is automatically increased to 2 by libssh2 to avoid busy loop corner + * of 1 is automatically incremented to 2 by libssh2 to avoid busy loop corner * cases. */ - IDX_SFTP_KEEPALIVE, + IDX_SFTP_SERVER_ALIVE_INTERVAL, #endif /** @@ -408,7 +408,7 @@ guac_vnc_settings* guac_vnc_parse_args(guac_user* user, /* Default keepalive value */ settings->sftp_keepalive = guac_user_parse_args_int(user, GUAC_VNC_CLIENT_ARGS, argv, - IDX_SFTP_KEEPALIVE, 0); + IDX_SFTP_SERVER_ALIVE_INTERVAL, 0); if (settings->sftp_keepalive == 1) guac_user_log(user, GUAC_LOG_WARNING, "The minimum allowed " "value for keepalives by libssh2 is 2 seconds.");
