[monit-dev] [monit] r361 committed - Fix Debian bug #621047: monit fails to build after SSLv2 removal

[monit]

Revision: 361
Author:   address@hidden
Date:     Wed Apr  6 00:27:58 2011
Log:      Fix Debian bug #621047: monit fails to build after SSLv2 removal
http://code.google.com/p/monit/source/detail?r=361

Modified:
 /trunk/CHANGES.txt
 /trunk/ssl.c

=======================================
--- /trunk/CHANGES.txt  Tue Apr  5 03:20:57 2011
+++ /trunk/CHANGES.txt  Wed Apr  6 00:27:58 2011
@@ -9,6 +9,8 @@

 Version 5.2.6

+* Fix Debian bug #621047: monit fails to build after SSLv2 removal
+


 Version 5.2.5
=======================================
--- /trunk/ssl.c        Wed Jan 19 10:40:32 2011
+++ /trunk/ssl.c        Wed Apr  6 00:27:58 2011
@@ -636,7 +636,10 @@
     break;

   case SSL_VERSION_SSLV2:
-#ifdef OPENSSL_FIPS
+#ifdef OPENSSL_NO_SSL2
+    LogError("SSLv2 is not allowed - use either SSLv3 or TLSv1");
+    goto sslerror;
+#elif defined(OPENSSL_FIPS)
     if (FIPS_mode()) {
       LogError("SSLv2 is not allowed in FIPS mode - use TLSv1");
       goto sslerror;