Merge 1.0.0 changes back to master.

This commit is contained in:
Michael Jumper 2018-10-16 09:05:37 -07:00
commit 6f49194640

View File

@ -197,6 +197,11 @@ enum VNC_ARGS_IDX {
*/ */
IDX_SFTP_HOSTNAME, 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 * The port of the SSH server to connect to for SFTP. If blank, the default
* SSH port of "22" will be used. * SSH port of "22" will be used.
@ -209,11 +214,6 @@ enum VNC_ARGS_IDX {
*/ */
IDX_SFTP_USERNAME, 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 * The password to provide when authenticating with the SSH server for
* SFTP (if not using a private key). * SFTP (if not using a private key).