3 files changed, 38 insertions, 20 deletions

diff --git a/plugins/check_curl.d/check_curl_helpers.c b/plugins/check_curl.d/check_curl_helpers.c
index d49d8f07..5af00973 100644
--- a/plugins/check_curl.d/check_curl_helpers.c
+++ b/plugins/check_curl.d/check_curl_helpers.c
@@ -19,7 +19,7 @@ bool add_sslctx_verify_fun = false;
 check_curl_configure_curl_wrapper
 check_curl_configure_curl(const check_curl_static_curl_config config,
                                                   check_curl_working_state working_state, bool check_cert,
-                                                  bool on_redirect_dependent, int follow_method, int max_depth) {
+                                                  bool on_redirect_dependent, int follow_method, long max_depth) {
         check_curl_configure_curl_wrapper result = {
                 .errorcode = OK,
                 .curl_state =
@@ -57,7 +57,7 @@ check_curl_configure_curl(const check_curl_static_curl_config config,
         result.curl_state.curl_easy_initialized = true;
 
         if (verbose >= 1) {
-                handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_VERBOSE, 1),
+                handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_VERBOSE, 1L),
                                                                            "CURLOPT_VERBOSE");
         }
 
@@ -128,8 +128,20 @@ check_curl_configure_curl(const check_curl_static_curl_config config,
         char dnscache[DEFAULT_BUFFER_SIZE];
         char addrstr[DEFAULT_BUFFER_SIZE / 2];
         if (working_state.use_ssl && working_state.host_name != NULL) {
+                char *tmp_mod_address;
+
+                /* lookup_host() requires an IPv6 address without the brackets. */
+                if ((strnlen(working_state.server_address, MAX_IPV4_HOSTLENGTH) > 2) &&
+                        (working_state.server_address[0] == '[')) {
+                        // Duplicate and strip the leading '['
+                        tmp_mod_address =
+                                strndup(working_state.server_address + 1, strlen(working_state.server_address) - 2);
+                } else {
+                        tmp_mod_address = working_state.server_address;
+                }
+
                 int res;
-                if ((res = lookup_host(working_state.server_address, addrstr, DEFAULT_BUFFER_SIZE / 2,
+                if ((res = lookup_host(tmp_mod_address, addrstr, DEFAULT_BUFFER_SIZE / 2,
                                                            config.sin_family)) != 0) {
                         die(STATE_CRITICAL,
                                 _("Unable to lookup IP address for '%s': getaddrinfo returned %d - %s"),
@@ -202,10 +214,10 @@ check_curl_configure_curl(const check_curl_static_curl_config config,
         if (working_state.http_method) {
                 if (!strcmp(working_state.http_method, "POST")) {
                         handle_curl_option_return_code(
-                                curl_easy_setopt(result.curl_state.curl, CURLOPT_POST, 1), "CURLOPT_POST");
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_POST, 1L), "CURLOPT_POST");
                 } else if (!strcmp(working_state.http_method, "PUT")) {
                         handle_curl_option_return_code(
-                                curl_easy_setopt(result.curl_state.curl, CURLOPT_UPLOAD, 1), "CURLOPT_UPLOAD");
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_UPLOAD, 1L), "CURLOPT_UPLOAD");
                 } else {
                         handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl,
                                                                                                                         CURLOPT_CUSTOMREQUEST,
@@ -288,10 +300,10 @@ check_curl_configure_curl(const check_curl_static_curl_config config,
                 /* per default if we have a CA verify both the peer and the
                  * hostname in the certificate, can be switched off later */
                 handle_curl_option_return_code(
-                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYPEER, 1),
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYPEER, 1L),
                         "CURLOPT_SSL_VERIFYPEER");
                 handle_curl_option_return_code(
-                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYHOST, 2),
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYHOST, 2L),
                         "CURLOPT_SSL_VERIFYHOST");
         } else {
                 /* backward-compatible behaviour, be tolerant in checks
@@ -299,10 +311,10 @@ check_curl_configure_curl(const check_curl_static_curl_config config,
                  * to be less tolerant about ssl verfications
                  */
                 handle_curl_option_return_code(
-                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYPEER, 0),
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYPEER, 0L),
                         "CURLOPT_SSL_VERIFYPEER");
                 handle_curl_option_return_code(
-                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYHOST, 0),
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYHOST, 0L),
                         "CURLOPT_SSL_VERIFYHOST");
         }
 
@@ -426,7 +438,7 @@ check_curl_configure_curl(const check_curl_static_curl_config config,
         if (on_redirect_dependent) {
                 if (follow_method == FOLLOW_LIBCURL) {
                         handle_curl_option_return_code(
-                                curl_easy_setopt(result.curl_state.curl, CURLOPT_FOLLOWLOCATION, 1),
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_FOLLOWLOCATION, 1L),
                                 "CURLOPT_FOLLOWLOCATION");
 
                         /* default -1 is infinite, not good, could lead to zombie plugins!
@@ -462,7 +474,7 @@ check_curl_configure_curl(const check_curl_static_curl_config config,
         }
         /* no-body */
         if (working_state.no_body) {
-                handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_NOBODY, 1),
+                handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_NOBODY, 1L),
                                                                            "CURLOPT_NOBODY");
         }
 
@@ -784,15 +796,17 @@ mp_subcheck check_document_dates(const curlhelp_write_curlbuf *header_buf, const
                                                   ((float)last_modified) / (60 * 60 * 24));
                                 sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
                         } else {
-                                xasprintf(&sc_document_dates.output, _("Last modified %ld:%02ld:%02ld ago"),
-                                                  last_modified / (60 * 60), (last_modified / 60) % 60, last_modified % 60);
+                                xasprintf(&sc_document_dates.output, _("Last modified %lld:%02d:%02d ago"),
+                                                  (long long)last_modified / (60 * 60), (int)(last_modified / 60) % 60,
+                                                  (int)last_modified % 60);
                                 sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
                         }
                 } else {
                         // TODO is this the OK case?
                         time_t last_modified = (srv_data - doc_data);
-                        xasprintf(&sc_document_dates.output, _("Last modified %ld:%02ld:%02ld ago"),
-                                          last_modified / (60 * 60), (last_modified / 60) % 60, last_modified % 60);
+                        xasprintf(&sc_document_dates.output, _("Last modified %lld:%02d:%02d ago"),
+                                          (long long)last_modified / (60 * 60), (int)(last_modified / 60) % 60,
+                                          (int)last_modified % 60);
                         sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_OK);
                 }
         }
@@ -1200,7 +1214,7 @@ mp_subcheck check_curl_certificate_checks(CURL *curl, X509 *cert, int warn_days_
 
                 cert_ptr_union cert_ptr = {0};
                 cert_ptr.to_info = NULL;
-                CURLcode res = curl_easy_getinfo(curl, CURLINFO_CERTINFO, &cert_ptr.to_info);
+                CURLcode res = curl_easy_getinfo(curl, CURLINFO_CERTINFO, &cert_ptr.to_certinfo);
                 if (!res && cert_ptr.to_info) {
 #       ifdef USE_OPENSSL
                         /* We have no OpenSSL in libcurl, but we can use OpenSSL for X509 cert
diff --git a/plugins/check_curl.d/check_curl_helpers.h b/plugins/check_curl.d/check_curl_helpers.h
index 87e45a9d..e77b763b 100644
--- a/plugins/check_curl.d/check_curl_helpers.h
+++ b/plugins/check_curl.d/check_curl_helpers.h
@@ -7,6 +7,10 @@
 #       include <openssl/opensslv.h>
 #endif
 
+enum {
+        MAX_IPV4_HOSTLENGTH = 255,
+};
+
 /* for buffers for header and body */
 typedef struct {
         size_t buflen;
@@ -76,7 +80,7 @@ check_curl_configure_curl_wrapper check_curl_configure_curl(check_curl_static_cu
                                                                                                                         check_curl_working_state working_state,
                                                                                                                         bool check_cert,
                                                                                                                         bool on_redirect_dependent,
-                                                                                                                        int follow_method, int max_depth);
+                                                                                                                        int follow_method, long max_depth);
 
 void handle_curl_option_return_code(CURLcode res, const char *option);
 
diff --git a/plugins/check_curl.d/config.h b/plugins/check_curl.d/config.h
index f51b2ee9..61067d46 100644
--- a/plugins/check_curl.d/config.h
+++ b/plugins/check_curl.d/config.h
@@ -57,10 +57,10 @@ typedef struct {
         bool haproxy_protocol;
         long socket_timeout;
         sa_family_t sin_family;
-        int curl_http_version;
+        long curl_http_version;
         char **http_opt_headers;
         size_t http_opt_headers_count;
-        int ssl_version;
+        long ssl_version;
         char *client_cert;
         char *client_privkey;
         char *ca_cert;
@@ -76,7 +76,7 @@ typedef struct {
         check_curl_working_state initial_config;
 
         check_curl_static_curl_config curl_config;
-        int max_depth;
+        long max_depth;
         int followmethod;
         int followsticky;