Re: (ITS#5955) build failure with gnutls: error: .struct ldapoptions. has no member named .ldo_tls_crlcheck.

-- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slangasek@ubuntu.com vorlon@debian.org --uAKRQypu60I7Lcqm Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=no-crlcheck-for-gnutls Author: Steve Langasek steve.langasek@canonical.com OpenLDAP 2.4.14 doesn't build with GnuTLS due to a missed guard around a use of an OpenSSL-specific option. ITS #5955 Index: trunk/libraries/libldap/tls2.c =================================================================== --- trunk.orig/libraries/libldap/tls2.c +++ trunk/libraries/libldap/tls2.c @@ -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; +#ifdef HAVE_OPENSSL_CRL case LDAP_OPT_X_TLS_CRLCHECK: /* OpenSSL only */ *(int *)arg = lo->ldo_tls_crlcheck; break; +#endif 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; --uAKRQypu60I7Lcqm--