summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Gooch <mrwizard@k12system.com>2013-12-20 12:46:20 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2013-12-20 16:30:14 (GMT)
commitcadf0d7ba866e004b409d165f4ac2391fe8b6b7c (patch)
tree8da5b1f9a5d00c8b340e970133e93afa55fcf875
parentaaee2c06329a9afac9f5e9d626957fe258615fa8 (diff)
downloadmonitoring-plugins-cadf0d7ba866e004b409d165f4ac2391fe8b6b7c.tar.gz
Fix for SSL Versioning when multiple options are used.
If you specify -S1 -C 30... The -C option will reset the ssl_version to 0. This is not a good thing. Instead we set the default to 0 and retain the version when later args are passed.
-rw-r--r--plugins/check_http.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 1595a59..4eba4b6 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -57,7 +57,7 @@ enum {
57 57
58#ifdef HAVE_SSL 58#ifdef HAVE_SSL
59int check_cert = FALSE; 59int check_cert = FALSE;
60int ssl_version; 60int ssl_version = 0;
61int days_till_exp_warn, days_till_exp_crit; 61int days_till_exp_warn, days_till_exp_crit;
62char *randbuff; 62char *randbuff;
63X509 *server_cert; 63X509 *server_cert;
@@ -339,10 +339,10 @@ process_arguments (int argc, char **argv)
339 case 'S': /* use SSL */ 339 case 'S': /* use SSL */
340#ifdef HAVE_SSL 340#ifdef HAVE_SSL
341 enable_ssl: 341 enable_ssl:
342 /* ssl_version initialized to 0 as a default. Only set if it's non-zero. This helps when we include multiple
343 parameters, like -S and -C combinations */
342 use_ssl = TRUE; 344 use_ssl = TRUE;
343 if (optarg == NULL || c != 'S') 345 if (c=='S' && optarg != NULL) {
344 ssl_version = 0;
345 else {
346 ssl_version = atoi(optarg); 346 ssl_version = atoi(optarg);
347 if (ssl_version < 1 || ssl_version > 3) 347 if (ssl_version < 1 || ssl_version > 3)
348 usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)")); 348 usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)"));