[Pkg-openldap-devel] r1207 - openldap/trunk/debian/patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-02-17 20:31:55 +0000 (Tue, 17 Feb 2009)
New Revision: 1207

Modified:
   openldap/trunk/debian/patches/no-crlcheck-for-gnutls
Log:
extend the patch to catch a few more references

Modified: openldap/trunk/debian/patches/no-crlcheck-for-gnutls
===================================================================
--- openldap/trunk/debian/patches/no-crlcheck-for-gnutls	2009-02-17 20:26:38 UTC (rev 1206)
+++ openldap/trunk/debian/patches/no-crlcheck-for-gnutls	2009-02-17 20:31:55 UTC (rev 1207)
@@ -9,7 +9,23 @@
 ===================================================================
 --- trunk.orig/libraries/libldap/tls2.c
 +++ trunk/libraries/libldap/tls2.c
-@@ -638,9 +638,11 @@
+@@ -562,6 +562,7 @@
+ 		}
+ 		return ldap_pvt_tls_set_option( ld, option, &i );
+ 		}
++#ifdef HAVE_OPENSSL_CRL
+ 	case LDAP_OPT_X_TLS_CRLCHECK:	/* OpenSSL only */
+ 		i = -1;
+ 		if ( strcasecmp( arg, "none" ) == 0 ) {
+@@ -575,6 +576,7 @@
+ 			return ldap_pvt_tls_set_option( ld, option, &i );
+ 		}
+ 		return -1;
++#endif
+ 	}
+ 	return -1;
+ }
+@@ -638,9 +640,11 @@
  	case LDAP_OPT_X_TLS_REQUIRE_CERT:
  		*(int *)arg = lo->ldo_tls_require_cert;
  		break;
@@ -21,3 +37,19 @@
  	case LDAP_OPT_X_TLS_CIPHER_SUITE:
  		*(char **)arg = lo->ldo_tls_ciphersuite ?
  			LDAP_STRDUP( lo->ldo_tls_ciphersuite ) : NULL;
+@@ -764,6 +768,7 @@
+ 			return 0;
+ 		}
+ 		return -1;
++#ifdef HAVE_OPENSSL_CRL
+ 	case LDAP_OPT_X_TLS_CRLCHECK:	/* OpenSSL only */
+ 		if ( !arg ) return -1;
+ 		switch( *(int *) arg ) {
+@@ -774,6 +779,7 @@
+ 			return 0;
+ 		}
+ 		return -1;
++#endif
+ 	case LDAP_OPT_X_TLS_CIPHER_SUITE:
+ 		if ( lo->ldo_tls_ciphersuite ) LDAP_FREE( lo->ldo_tls_ciphersuite );
+ 		lo->ldo_tls_ciphersuite = arg ? LDAP_STRDUP( (char *) arg ) : NULL;