summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Wagner <waja@cyconet.org>2013-10-01 07:26:41 (GMT)
committerJan Wagner <waja@cyconet.org>2014-07-21 11:32:20 (GMT)
commit3bf812beaee7035b1c08e49b55d7962056931d7b (patch)
tree5ccd97cf142ba119c7818a75d334bd8ea634965f
parent69b719aa2e3bd8dfd643d7cbe60e6e165d5279ea (diff)
downloadmonitoring-plugins-3bf812beaee7035b1c08e49b55d7962056931d7b.tar.gz
sslutils: expire time in local timezone format
sshutils prints the expiry time of certificates in US format this patch uses the strftime %c, I don't know how portable that is Thanks to Neil Prockter. Closes #1188 Closes #1161 Closes #977 Closes #976 Closes #975 Closes #840 Closes #382
-rw-r--r--THANKS.in1
-rw-r--r--plugins/sslutils.c9
2 files changed, 5 insertions, 5 deletions
diff --git a/THANKS.in b/THANKS.in
index 43ba182..6738ae7 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -324,3 +324,4 @@ Jean-Claude Computing
324Andy Brist 324Andy Brist
325Mikael Falkvidd 325Mikael Falkvidd
326Patric Wust 326Patric Wust
327Neil Prockter
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 687bffb..d0ae474 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -153,7 +153,8 @@ int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
153 struct tm stamp; 153 struct tm stamp;
154 float time_left; 154 float time_left;
155 int days_left; 155 int days_left;
156 char timestamp[17] = ""; 156 char timestamp[50] = "";
157 time_t tm_t;
157 158
158 certificate=SSL_get_peer_certificate(s); 159 certificate=SSL_get_peer_certificate(s);
159 if (!certificate) { 160 if (!certificate) {
@@ -211,10 +212,8 @@ int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
211 212
212 time_left = difftime(timegm(&stamp), time(NULL)); 213 time_left = difftime(timegm(&stamp), time(NULL));
213 days_left = time_left / 86400; 214 days_left = time_left / 86400;
214 snprintf 215 tm_t = mktime (&stamp);
215 (timestamp, 17, "%02d/%02d/%04d %02d:%02d", 216 strftime(timestamp, 50, "%c", localtime(&tm_t));
216 stamp.tm_mon + 1,
217 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
218 217
219 if (days_left > 0 && days_left <= days_till_exp_warn) { 218 if (days_left > 0 && days_left <= days_till_exp_warn) {
220 printf (_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left>days_till_exp_crit)?"WARNING":"CRITICAL", cn, days_left, timestamp); 219 printf (_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left>days_till_exp_crit)?"WARNING":"CRITICAL", cn, days_left, timestamp);