diff options
author | Sven Nierlein <sven@nierlein.de> | 2018-10-29 15:09:57 +0100 |
---|---|---|
committer | Sven Nierlein <sven@nierlein.de> | 2018-10-29 15:09:57 +0100 |
commit | 36fd675fbe02f2492c4adbb001da38856f96c2f2 (patch) | |
tree | 977b01bd29d8ee919f6db7ac2e6015ee9a338cf7 | |
parent | 70d36a729e2bc0ecfb24751074663c21160f02f4 (diff) | |
download | monitoring-plugins-36fd675fbe02f2492c4adbb001da38856f96c2f2.tar.gz |
check_curl: code cleanup
CURLOPT_RESOLVE is not required, since we do not verify certificates in any way.
-rw-r--r-- | plugins/check_curl.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/plugins/check_curl.c b/plugins/check_curl.c index 7a516a9e..58f454b8 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c | |||
@@ -377,17 +377,6 @@ check_http (void) | |||
377 | printf ("* curl CURLOPT_URL: %s\n", url); | 377 | printf ("* curl CURLOPT_URL: %s\n", url); |
378 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_URL, url), "CURLOPT_URL"); | 378 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_URL, url), "CURLOPT_URL"); |
379 | 379 | ||
380 | /* cURL does certificate checking against the host name from the URL above | ||
381 | * So we use CURLOPT_CONNECT_TO or CURLOPT_RESOLVE to handle differing | ||
382 | * host names and/or ports */ | ||
383 | #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 3) | ||
384 | if (host_name && strcmp (host_name, server_address)) { | ||
385 | snprintf (server_ip, DEFAULT_BUFFER_SIZE, "%s:%d:%s", host_name, server_port, server_address); | ||
386 | server_ips = curl_slist_append (server_ips, server_ip); | ||
387 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_RESOLVE, server_ips), "CURLOPT_RESOLVE"); | ||
388 | } | ||
389 | #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 3) */ | ||
390 | |||
391 | /* extract proxy information for legacy proxy https requests */ | 380 | /* extract proxy information for legacy proxy https requests */ |
392 | if (!strcmp(http_method, "CONNECT") || strstr(server_url, "http") == server_url) { | 381 | if (!strcmp(http_method, "CONNECT") || strstr(server_url, "http") == server_url) { |
393 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_PROXY, server_address), "CURLOPT_PROXY"); | 382 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_PROXY, server_address), "CURLOPT_PROXY"); |