8.17.0 regression: Builds with no CURL_CA_PATH ignore CURLOPT_CAPATH

[bradking]

I did this

Build libcurl with --without-ca-bundle (or -DCURL_CA_PATH:STRING=none with CMake), such that no CURL_CA_PATH is defined here.

Then explicitly set the CURLOPT_CAPATH option in an application linked to libcurl:

curl_easy_setopt(curl, CURLOPT_CAPATH, "/some/path");

I expected the following

CApath is /some/path. Instead the CURLOPT_CAPATH setting is ignored.

curl/libcurl version

curl 8.17.0

The problem bisects to commit eefd03c, #18703.

operating system

Any using OpenSSL or similar.

[bradking]

Applying

This patch

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index df0449cbee..2a4e2ca949 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -310,8 +310,8 @@ CURLcode Curl_ssl_easy_config_complete(struct Curl_easy *data)
       if(result)
         return result;
     }
-    sslc->primary.CApath = data->set.str[STRING_SSL_CAPATH];
 #endif
+    sslc->primary.CApath = data->set.str[STRING_SSL_CAPATH];
 #ifdef CURL_CA_BUNDLE
     if(!sslc->custom_cafile && !set->str[STRING_SSL_CAFILE]) {
       result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], CURL_CA_BUNDLE);
@@ -358,8 +358,8 @@ CURLcode Curl_ssl_easy_config_complete(struct Curl_easy *data)
       if(result)
         return result;
     }
-    sslc->primary.CApath = data->set.str[STRING_SSL_CAPATH_PROXY];
 #endif
+    sslc->primary.CApath = data->set.str[STRING_SSL_CAPATH_PROXY];
 #ifdef CURL_CA_BUNDLE
     if(!sslc->custom_cafile && !set->str[STRING_SSL_CAFILE_PROXY]) {
       result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY],

resolves the problem.