summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Hädicke <felixhaedicke@web.de>2019-01-23 23:10:39 +0100
committerDaniel Stenberg <daniel@haxx.se>2019-01-24 09:09:45 +0100
commit3cbf731d9ec7146f9f1a6ac0fbd9af7fe358f5bb (patch)
tree0f21f2280a6315636eea31638f394b4d33aa6339
parent15c94b310bf9e0c92d71fca5a88eb67a1e2548a6 (diff)
downloadcurl-3cbf731d9ec7146f9f1a6ac0fbd9af7fe358f5bb.tar.gz
setopt: enable CURLOPT_SSH_KNOWNHOSTS and CURLOPT_SSH_KEYFUNCTION for libssh
CURLOPT_SSH_KNOWNHOSTS and CURLOPT_SSH_KEYFUNCTION are supported for libssh as well. So accepting these options only when compiling with libssh2 is wrong here. Fixes #3493 Closes #3494
-rw-r--r--lib/setopt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/setopt.c b/lib/setopt.c
index 62cdf4965..d98ca66c9 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -2237,7 +2237,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,
result = Curl_setstropt(&data->set.str[STRING_SSH_HOST_PUBLIC_KEY_MD5],
va_arg(param, char *));
break;
-#ifdef HAVE_LIBSSH2_KNOWNHOST_API
+
case CURLOPT_SSH_KNOWNHOSTS:
/*
* Store the file name to read known hosts from.
@@ -2258,7 +2258,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,
*/
data->set.ssh_keyfunc_userp = va_arg(param, void *);
break;
-#endif /* HAVE_LIBSSH2_KNOWNHOST_API */
#endif /* USE_LIBSSH2 */
case CURLOPT_HTTP_TRANSFER_DECODING: