[nagiosplug] check_http: Fix compilation without SSL support

Nagios Plugin Development nagios-plugins at users.sourceforge.net
Wed Jul 18 23:50:46 CEST 2012


 Module: nagiosplug
 Branch: master
 Commit: ea595f1371820b79041af0a0fa52bd954ea35665
 Author: Holger Weiss <holger at zedat.fu-berlin.de>
   Date: Wed Jul 18 23:31:17 2012 +0200
    URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=ea595f1

check_http: Fix compilation without SSL support

The "ssl_version" variable was undeclared when the plugins were compiled
--without-openssl and --without-gnutls.

Bug reported by Michael LaCorte on the "nagiosplug-help" mailing list
(Message-ID: <CCD30C91-A2A8-463A-82A9-F99B54F741D3 at gmail.com>).

---

 plugins/check_http.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 77a235e..37cf01a 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -304,9 +304,7 @@ process_arguments (int argc, char **argv)
       /* Fall through to -S option */
 #endif
     case 'S': /* use SSL */
-#ifndef HAVE_SSL
-      usage4 (_("Invalid option - SSL is not available"));
-#endif
+#ifdef HAVE_SSL
       use_ssl = TRUE;
       if (optarg == NULL || c != 'S')
         ssl_version = 0;
@@ -317,6 +315,9 @@ process_arguments (int argc, char **argv)
       }
       if (specify_port == FALSE)
         server_port = HTTPS_PORT;
+#else
+      usage4 (_("Invalid option - SSL is not available"));
+#endif
       break;
     case SNI_OPTION:
       use_sni = TRUE;





More information about the Commits mailing list