ITS#5955 fix

warnings fix

diff --git a/CHANGES b/CHANGES
index f4048642f7acf62f2cd2e39bc27221e100014d6a..bac96ae2f70a11ed5595b19ffb0fcd7753b4ec91 100644 (file)
--- 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 baadb1375d3901a2f7753a576ddd4924f4605eff..871ffe574c0f444c1a57e9bbd09e29aeedefa193 100644 (file)
--- 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;