[Nagiosplug-checkins] nagiosplug/plugins check_http.c,1.87,1.88

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6245

Modified Files:
	check_http.c 
Log Message:
-C now implies -S/--ssl as well


Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- check_http.c	18 Mar 2006 14:47:51 -0000	1.87
+++ check_http.c	24 Mar 2006 16:25:46 -0000	1.88
@@ -253,25 +253,23 @@
     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"))