From 193051dfd534f18ef6d87b0359d2802daee6d195 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Wed, 14 Jun 2017 08:40:07 -0400
Subject: [PATCH] GUACAMOLE-203: Change parameter name for consistency

---
 src/protocols/rdp/rdp_settings.c | 6 +++---
 src/protocols/vnc/settings.c     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index 32c09415..2b6635f8 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.");
diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index 60e2f61c..a9e4228a 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.");