From 293fc70756f2cbc8ad8c7c91e094a83c23d4c059 Mon Sep 17 00:00:00 2001
From: Ton Voon <tonvoon@users.sourceforge.net>
Date: Fri, 24 Mar 2006 16:25:46 +0000
Subject: [PATCH] -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
---
 plugins/check_http.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 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,6 +253,16 @@ process_arguments (int argc, char **argv)
     case 'n': /* do not show html link */
       display_html = FALSE;
       break;
+    case 'C': /* Check SSL cert validity */
+#ifdef HAVE_SSL
+      if (!is_intnonneg (optarg))
+        usage2 (_("Invalid certificate expiration period"), optarg);
+      else {
+        days_till_exp = atoi (optarg);
+        check_cert = TRUE;
+      }
+     /* Fall through to -S option */
+#endif
     case 'S': /* use SSL */
 #ifndef HAVE_SSL
       usage4 (_("Invalid option - SSL is not available"));
@@ -261,18 +271,6 @@ process_arguments (int argc, char **argv)
       if (specify_port == FALSE)
         server_port = HTTPS_PORT;
       break;
-    case 'C': /* Check SSL cert validity */
-#ifdef USE_OPENSSL
-      if (!is_intnonneg (optarg))
-        usage2 (_("Invalid certificate expiration period"), optarg);
-      else {
-        days_till_exp = atoi (optarg);
-        check_cert = TRUE;
-      }
-#else
-      usage4 (_("Invalid option - SSL is not available"));
-#endif
-      break;
     case 'f': /* onredirect */
       if (!strcmp (optarg, "follow"))
         onredirect = STATE_DEPENDENT;