commit 0ffda8aaf0d4cd94f452a242f8a509e4bc86fea0
author Michael Jumper <mjumper@apache.org> Tue Oct 16 09:03:02 2018 -0700
committer Michael Jumper <mjumper@apache.org> Tue Oct 16 09:03:02 2018 -0700
tree bbd047f556b12fe892cb76b364bf3e56c42c6d34
parent a1ba91b01d09c387c3ab3c94ea785b81ea3ddf99
parent 34c088882b2678a353a3ea101227fce9db42babf

GUACAMOLE-527: Merge correction to order of SFTP parameters for VNC.

src/protocols/vnc/settings.c

diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index 587864a..8f65cfb 100644
--- a/src/protocols/vnc/settings.c
+++ b/src/protocols/vnc/settings.c
@@ -198,6 +198,11 @@
     IDX_SFTP_HOSTNAME,
 
     /**
+     * The public SSH host key to identify the SFTP server.
+     */
+    IDX_SFTP_HOST_KEY,
+
+    /**
      * The port of the SSH server to connect to for SFTP. If blank, the default
      * SSH port of "22" will be used.
      */
@@ -210,11 +215,6 @@
     IDX_SFTP_USERNAME,
 
     /**
-     * The public SSH host key to identify the SFTP server.
-     */
-    IDX_SFTP_HOST_KEY,
-
-    /**
      * The password to provide when authenticating with the SSH server for
      * SFTP (if not using a private key).
      */