summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2012-05-28 19:42:48 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2012-05-28 19:42:48 (GMT)
commitec2596b92d013a320e171f81912149915ef7ea40 (patch)
treef0bc902bb87d9da6e22dda0a8a8d4191db1cfaf1 /plugins
parentbc3307ed6e9911ef9a9e882b00bdb2fa32158fa3 (diff)
downloadmonitoring-plugins-ec2596b92d013a320e171f81912149915ef7ea40.tar.gz
check_http: Don't ignore SSL initialization errors
SSL initialization errors are now handled properly by check_http (#3095106 - Eric Schoeller).
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_http.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c
index ea7ddec..8712079 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -806,7 +806,9 @@ check_http (void)
806 die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n")); 806 die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
807#ifdef HAVE_SSL 807#ifdef HAVE_SSL
808 if (use_ssl == TRUE) { 808 if (use_ssl == TRUE) {
809 np_net_ssl_init_with_hostname_and_version(sd, (use_sni ? host_name : NULL), ssl_version); 809 result = np_net_ssl_init_with_hostname_and_version(sd, (use_sni ? host_name : NULL), ssl_version);
810 if (result != STATE_OK)
811 return result;
810 if (check_cert == TRUE) { 812 if (check_cert == TRUE) {
811 result = np_net_ssl_check_cert(days_till_exp); 813 result = np_net_ssl_check_cert(days_till_exp);
812 np_net_ssl_cleanup(); 814 np_net_ssl_cleanup();