From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 23 Oct 2003 07:46:22 +0000 (+0000)
Subject: Georg Horn's patch. -k is no longer mutually exclusive with --cacert and
X-Git-Tag: curl-7_10_8~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f32d011d907175c158ecd7ec02eb4dbed73ed29e;p=thirdparty%2Fcurl.git

Georg Horn's patch. -k is no longer mutually exclusive with --cacert and
--capath. Using -k together with one of those just means that the result
of the CA cert check is ignored (but displayed if -v is used).
---

diff --git a/src/main.c b/src/main.c
index cd9b5f03f6..06fc8dff0d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3158,12 +3158,11 @@ operate(struct Configurable *config, int argc, char *argv[])
             curl_easy_setopt(curl, CURLOPT_CAPATH, config->capath);
           curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, TRUE);
         }
-        else
-          if(config->insecure_ok) {
-            /* new stuff needed for libcurl 7.10 */
-            curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
-            curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1);
-          }
+        if(config->insecure_ok) {
+          /* new stuff needed for libcurl 7.10 */
+          curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
+          curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1);
+        }
       
         if((config->conf&CONF_NOBODY) ||
            config->remote_time) {