aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ton Voon <tonvoon@users.sourceforge.net> 2006-03-24 16:25:46 +0000
committerGravatar Ton Voon <tonvoon@users.sourceforge.net> 2006-03-24 16:25:46 +0000
commit293fc70756f2cbc8ad8c7c91e094a83c23d4c059 (patch)
tree0389484cce40dd9388ff28995acd95a4b29c07c2
parentf6bfe34a3e3c8c46c2cb5fc728773c2f4b191c8f (diff)
downloadmonitoring-plugins-293fc70756f2cbc8ad8c7c91e094a83c23d4c059.tar.gz
-C now implies -S/--ssl as well
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1355 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/check_http.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 54e5ff29..58cf83cf 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -253,25 +253,23 @@ process_arguments (int argc, char **argv)
case 'n': /* do not show html link */
display_html = FALSE;
break;
- case 'S': /* use SSL */
-#ifndef HAVE_SSL
- usage4 (_("Invalid option - SSL is not available"));
-#endif
- use_ssl = TRUE;
- if (specify_port == FALSE)
- server_port = HTTPS_PORT;
- break;
case 'C': /* Check SSL cert validity */
-#ifdef USE_OPENSSL
+#ifdef HAVE_SSL
if (!is_intnonneg (optarg))
usage2 (_("Invalid certificate expiration period"), optarg);
else {
days_till_exp = atoi (optarg);
check_cert = TRUE;
}
-#else
+ /* Fall through to -S option */
+#endif
+ case 'S': /* use SSL */
+#ifndef HAVE_SSL
usage4 (_("Invalid option - SSL is not available"));
#endif
+ use_ssl = TRUE;
+ if (specify_port == FALSE)
+ server_port = HTTPS_PORT;
break;
case 'f': /* onredirect */
if (!strcmp (optarg, "follow"))