[Pkg-nagios-devel] nagios-plugins/debian/patches 16_check_smtp_protocolfix.dpatch, 1.4, 1.5

[seanius at haydn.debian.org]

Update of /cvsroot/pkg-nagios/nagios-plugins/debian/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv24166/debian/patches

Modified Files:
	16_check_smtp_protocolfix.dpatch 
Log Message:
whee, gnutls works

Index: 16_check_smtp_protocolfix.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios-plugins/debian/patches/16_check_smtp_protocolfix.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 16_check_smtp_protocolfix.dpatch	10 Oct 2005 07:41:14 -0000	1.4
+++ 16_check_smtp_protocolfix.dpatch	10 Oct 2005 07:48:10 -0000	1.5
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad nagios-plugins~/plugins/check_smtp.c nagios-plugins/plugins/check_smtp.c
---- nagios-plugins~/plugins/check_smtp.c	2005-10-10 09:29:32.000000000 +0200
-+++ nagios-plugins/plugins/check_smtp.c	2005-10-10 09:32:19.000000000 +0200
+--- nagios-plugins~/plugins/check_smtp.c	2005-10-10 09:42:59.000000000 +0200
++++ nagios-plugins/plugins/check_smtp.c	2005-10-10 09:45:34.000000000 +0200
 @@ -59,10 +59,17 @@
  enum {
  	SMTP_PORT	= 25
@@ -165,6 +165,15 @@
  			break;
  		case 'D':
  		/* Check SSL cert validity */
+@@ -581,7 +624,7 @@
+ 
+   /* Initialize SSL context */
+   SSLeay_add_ssl_algorithms ();
+-  meth = SSLv2_client_method ();
++  meth = SSLv23_client_method ();
+   SSL_load_error_strings ();
+   if ((ctx = SSL_CTX_new (meth)) == NULL)
+     {
 @@ -602,11 +645,6 @@
      {
        printf (_("CRITICAL - Cannot initiate SSL handshake.\n"));
@@ -186,4 +195,3 @@
      SSL_shutdown (ssl);
      SSL_free (ssl);
      SSL_CTX_free (ctx);
-