summaryrefslogtreecommitdiffstats
path: root/plugins/check_http.c
diff options
context:
space:
mode:
authorvagrant <vagrant@debiantesting-64>2016-11-13 19:39:46 +0000
committerSven Nierlein <sven@nierlein.de>2016-11-13 21:14:02 +0000
commitfe1c4bb0e5ea3632d608a6b8b7e51d580856d833 (patch)
tree5fceabfc6f53b2bf7505bba099fa75d6cc8159bc /plugins/check_http.c
parent2f845e9ebc2b7bcf6472e0191752215d351e4e7c (diff)
downloadmonitoring-plugins-fe1c4bb0e5ea3632d608a6b8b7e51d580856d833.tar.gz
add openssl 1.1 support
changes: - CRYPTO_lock detection replaced in configure.ac. We don't use that function anywhere, so just replace it with the suggested one from https://wiki.openssl.org/index.php/Library_Initialization#Autoconf - OPENSSL_NO_SSL2 is no longer defined while ssl2 is not included. Set it ourself using the suggested openssl 1.1 version check from https://wiki.openssl.org/index.php/1.1_API_Changes#Backward_compatibility - openssl 1.1 sends a sigpipe if the connection is still open when calling SSL_shutdown(), so move the close before the shutdown. Signed-off-by: Sven Nierlein <sven@nierlein.de>
Diffstat (limited to 'plugins/check_http.c')
-rw-r--r--plugins/check_http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 60fe4d52..2347a6f2 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -941,8 +941,8 @@ check_http (void)
941 elapsed_time_ssl = (double)microsec_ssl / 1.0e6; 941 elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
942 if (check_cert == TRUE) { 942 if (check_cert == TRUE) {
943 result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); 943 result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
944 np_net_ssl_cleanup();
945 if (sd) close(sd); 944 if (sd) close(sd);
945 np_net_ssl_cleanup();
946 return result; 946 return result;
947 } 947 }
948 } 948 }
@@ -1086,10 +1086,10 @@ check_http (void)
1086 die (STATE_CRITICAL, _("HTTP CRITICAL - No data received from host\n")); 1086 die (STATE_CRITICAL, _("HTTP CRITICAL - No data received from host\n"));
1087 1087
1088 /* close the connection */ 1088 /* close the connection */
1089 if (sd) close(sd);
1089#ifdef HAVE_SSL 1090#ifdef HAVE_SSL
1090 np_net_ssl_cleanup(); 1091 np_net_ssl_cleanup();
1091#endif 1092#endif
1092 if (sd) close(sd);
1093 1093
1094 /* Save check time */ 1094 /* Save check time */
1095 microsec = deltime (tv); 1095 microsec = deltime (tv);