diff options
| author | RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> | 2021-11-17 17:57:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 17:57:00 +0100 |
| commit | ad45727dbe03fae94ed2a7ac26ca828fe0fa6264 (patch) | |
| tree | 450128f815d3dfb7e70f8038725dd086f8880285 | |
| parent | 024d268386353133af1a9ff5c0b5879397c19b1c (diff) | |
| parent | 63cb7ecfcf8d5b6c9f2be704eee7fa7cd9216f88 (diff) | |
| download | monitoring-plugins-ad45727.tar.gz | |
Merge pull request #1688 from bazzisoft/master
check_curl.c: bugfix: verify certificates option should not force SSL to be used
| -rw-r--r-- | plugins/check_curl.c | 2 | ||||
| -rw-r--r-- | plugins/t/check_curl.t | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/check_curl.c b/plugins/check_curl.c index 5990b95b..14cc8463 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c | |||
| @@ -1422,7 +1422,7 @@ process_arguments (int argc, char **argv) | |||
| 1422 | #ifdef LIBCURL_FEATURE_SSL | 1422 | #ifdef LIBCURL_FEATURE_SSL |
| 1423 | case 'D': /* verify peer certificate & host */ | 1423 | case 'D': /* verify peer certificate & host */ |
| 1424 | verify_peer_and_host = TRUE; | 1424 | verify_peer_and_host = TRUE; |
| 1425 | goto enable_ssl; | 1425 | break; |
| 1426 | #endif | 1426 | #endif |
| 1427 | case 'S': /* use SSL */ | 1427 | case 'S': /* use SSL */ |
| 1428 | #ifdef LIBCURL_FEATURE_SSL | 1428 | #ifdef LIBCURL_FEATURE_SSL |
diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t index 45ee5339..ada6a045 100644 --- a/plugins/t/check_curl.t +++ b/plugins/t/check_curl.t | |||
| @@ -95,7 +95,7 @@ SKIP: { | |||
| 95 | $res = NPTest->testCmd("./$plugin -v -H $host_tls_http:443 -S -p 443"); | 95 | $res = NPTest->testCmd("./$plugin -v -H $host_tls_http:443 -S -p 443"); |
| 96 | like( $res->output, '/^Host: '.$host_tls_http.'\s*$/ms', "Host Header OK" ); | 96 | like( $res->output, '/^Host: '.$host_tls_http.'\s*$/ms', "Host Header OK" ); |
| 97 | 97 | ||
| 98 | $res = NPTest->testCmd("./$plugin -v -H $host_tls_http -D -p 443"); | 98 | $res = NPTest->testCmd("./$plugin -v -H $host_tls_http -D -S -p 443"); |
| 99 | like( $res->output, '/(^Host: '.$host_tls_http.'\s*$)|(cURL returned 60)/ms', "Host Header OK" ); | 99 | like( $res->output, '/(^Host: '.$host_tls_http.'\s*$)|(cURL returned 60)/ms', "Host Header OK" ); |
| 100 | }; | 100 | }; |
| 101 | 101 | ||