From efba08cb53a8230a18f0b751b5bdb5def09d859c Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 17 Feb 2009 21:35:11 +0000 Subject: [PATCH] ITS#5955 fix warnings fix --- CHANGES | 1 + libraries/libldap/tls2.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index f4048642f7..bac96ae2f7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ OpenLDAP 2.4 Change Log OpenLDAP 2.4.15 Engineering + Fixed libldap GnuTLS compilation (ITS#5955) Fixed slapd corrupt contextCSN (ITS#5947) Fixed slapo-rwm objectClass preservation (ITS#5760) diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c index baadb1375d..871ffe574c 100644 --- a/libraries/libldap/tls2.c +++ b/libraries/libldap/tls2.c @@ -143,7 +143,6 @@ void ldap_pvt_tls_destroy( void ) { struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT(); - int i; ldap_int_tls_destroy( lo ); @@ -179,8 +178,6 @@ tls_init(tls_impl *impl ) int ldap_pvt_tls_init( void ) { - struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT(); - return tls_init( tls_imp ); } @@ -190,7 +187,7 @@ ldap_pvt_tls_init( void ) static int ldap_int_tls_init_ctx( struct ldapoptions *lo, int is_server ) { - int i, rc = 0; + int rc = 0; tls_impl *ti = tls_imp; struct ldaptls lts = lo->ldo_tls_info; @@ -638,9 +635,11 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg ) 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; -- 2.39.5