curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-11 14:42:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

curl/config2setopts: move SSH related options into same block

Browse Source 
Move the code setting SSH specific libcurl options into the same block
to avoid having a separate almost identical condition later.

Closes #15444
This commit is contained in:
Daniel Stenberg 2024-10-29 10:15:53 +01:00
parent 84f96e3363
commit a70f5bc4b5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/tool_operate.c
View File

@ -1169,6 +1169,22 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in libcurl 7.56.0 */ /* new in libcurl 7.56.0 */
if(config->ssh_compression) if(config->ssh_compression)
my_setopt(curl, CURLOPT_SSH_COMPRESSION, 1L); my_setopt(curl, CURLOPT_SSH_COMPRESSION, 1L);
if(!config->insecure_ok) {
char *known = findfile(".ssh/known_hosts", FALSE);
if(known) {
/* new in curl 7.19.6 */
result = res_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, known);
curl_free(known);
if(result == CURLE_UNKNOWN_OPTION)
/* libssh2 version older than 1.1.1 */
result = CURLE_OK;
if(result)
return result;
}
else
warnf(global, "Couldn't find a known_hosts file");
}
} }
if(config->cacert) if(config->cacert)
@ -1344,23 +1360,6 @@ static CURLcode config2setopts(struct GlobalConfig *global,
if(config->path_as_is) if(config->path_as_is)
my_setopt(curl, CURLOPT_PATH_AS_IS, 1L); my_setopt(curl, CURLOPT_PATH_AS_IS, 1L);
if((use_proto == proto_scp || use_proto == proto_sftp) &&
!config->insecure_ok) {
char *known = findfile(".ssh/known_hosts", FALSE);
if(known) {
/* new in curl 7.19.6 */
result = res_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, known);
curl_free(known);
if(result == CURLE_UNKNOWN_OPTION)
/* libssh2 version older than 1.1.1 */
result = CURLE_OK;
if(result)
return result;
}
else
warnf(global, "Couldn't find a known_hosts file");
}
if(config->no_body || config->remote_time) { if(config->no_body || config->remote_time) {
/* no body or use remote time */ /* no body or use remote time */
my_setopt(curl, CURLOPT_FILETIME, 1L); my_setopt(curl, CURLOPT_FILETIME, 1L);