1
Author: Steve Langasek <steve.langasek@canonical.com>
3
OpenLDAP 2.4.14 doesn't build with GnuTLS due to a missed guard around a
4
use of an OpenSSL-specific option.
8
Index: trunk/libraries/libldap/tls2.c
9
===================================================================
10
--- trunk.orig/libraries/libldap/tls2.c
11
+++ trunk/libraries/libldap/tls2.c
14
return ldap_pvt_tls_set_option( ld, option, &i );
16
+#ifdef HAVE_OPENSSL_CRL
17
case LDAP_OPT_X_TLS_CRLCHECK: /* OpenSSL only */
19
if ( strcasecmp( arg, "none" ) == 0 ) {
21
return ldap_pvt_tls_set_option( ld, option, &i );
29
case LDAP_OPT_X_TLS_REQUIRE_CERT:
30
*(int *)arg = lo->ldo_tls_require_cert;
32
+#ifdef HAVE_OPENSSL_CRL
33
case LDAP_OPT_X_TLS_CRLCHECK: /* OpenSSL only */
34
*(int *)arg = lo->ldo_tls_crlcheck;
37
case LDAP_OPT_X_TLS_CIPHER_SUITE:
38
*(char **)arg = lo->ldo_tls_ciphersuite ?
39
LDAP_STRDUP( lo->ldo_tls_ciphersuite ) : NULL;
44
+#ifdef HAVE_OPENSSL_CRL
45
case LDAP_OPT_X_TLS_CRLCHECK: /* OpenSSL only */
46
if ( !arg ) return -1;
47
switch( *(int *) arg ) {
53
case LDAP_OPT_X_TLS_CIPHER_SUITE:
54
if ( lo->ldo_tls_ciphersuite ) LDAP_FREE( lo->ldo_tls_ciphersuite );
55
lo->ldo_tls_ciphersuite = arg ? LDAP_STRDUP( (char *) arg ) : NULL;