moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

curl: warn for --capath use if not supported by libcurl

Browse Source 
Closes #492
This commit is contained in:
Daniel Stenberg 2016-03-28 20:28:23 +02:00
parent 768f18f442
commit ab86007df4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tool_operate.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -239,6 +239,7 @@ static CURLcode operate_do(struct GlobalConfig *global,
* We support the environment variable thing for non-Windows platforms * We support the environment variable thing for non-Windows platforms
* too. Just for the sake of it. * too. Just for the sake of it.
*/ */
bool capath_from_env = false;
if(!config->cacert && if(!config->cacert &&
!config->capath && !config->capath &&
!config->insecure_ok) { !config->insecure_ok) {
@ -263,6 +264,7 @@ static CURLcode operate_do(struct GlobalConfig *global,
result = CURLE_OUT_OF_MEMORY; result = CURLE_OUT_OF_MEMORY;
goto quit_curl; goto quit_curl;
} }
capath_from_env = true;
} }
else { else {
env = curlx_getenv("SSL_CERT_FILE"); env = curlx_getenv("SSL_CERT_FILE");
@ -1009,8 +1011,16 @@ static CURLcode operate_do(struct GlobalConfig *global,
if(config->cacert) if(config->cacert)
my_setopt_str(curl, CURLOPT_CAINFO, config->cacert); my_setopt_str(curl, CURLOPT_CAINFO, config->cacert);
if(config->capath) if(config->capath) {
my_setopt_str(curl, CURLOPT_CAPATH, config->capath); result = res_setopt_str(curl, CURLOPT_CAPATH, config->capath);
if(result == CURLE_NOT_BUILT_IN) {
warnf(config->global, "ignoring %s, not supported by libcurl\n",
capath_from_env?
"SSL_CERT_DIR environment variable":"--capath");
}
else if(result)
goto show_error;
}
if(config->crlfile) if(config->crlfile)
my_setopt_str(curl, CURLOPT_CRLFILE, config->crlfile); my_setopt_str(curl, CURLOPT_CRLFILE, config->crlfile);