Skip to content
Snippets Groups Projects
Commit efba08cb authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5955 fix

warnings fix
parent ae9c14c8
No related branches found
No related tags found
No related merge requests found
OpenLDAP 2.4 Change Log OpenLDAP 2.4 Change Log
OpenLDAP 2.4.15 Engineering OpenLDAP 2.4.15 Engineering
Fixed libldap GnuTLS compilation (ITS#5955)
Fixed slapd corrupt contextCSN (ITS#5947) Fixed slapd corrupt contextCSN (ITS#5947)
Fixed slapo-rwm objectClass preservation (ITS#5760) Fixed slapo-rwm objectClass preservation (ITS#5760)
......
...@@ -143,7 +143,6 @@ void ...@@ -143,7 +143,6 @@ void
ldap_pvt_tls_destroy( void ) ldap_pvt_tls_destroy( void )
{ {
struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT(); struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();
int i;
ldap_int_tls_destroy( lo ); ldap_int_tls_destroy( lo );
...@@ -179,8 +178,6 @@ tls_init(tls_impl *impl ) ...@@ -179,8 +178,6 @@ tls_init(tls_impl *impl )
int int
ldap_pvt_tls_init( void ) ldap_pvt_tls_init( void )
{ {
struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();
return tls_init( tls_imp ); return tls_init( tls_imp );
} }
...@@ -190,7 +187,7 @@ ldap_pvt_tls_init( void ) ...@@ -190,7 +187,7 @@ ldap_pvt_tls_init( void )
static int static int
ldap_int_tls_init_ctx( struct ldapoptions *lo, int is_server ) ldap_int_tls_init_ctx( struct ldapoptions *lo, int is_server )
{ {
int i, rc = 0; int rc = 0;
tls_impl *ti = tls_imp; tls_impl *ti = tls_imp;
struct ldaptls lts = lo->ldo_tls_info; struct ldaptls lts = lo->ldo_tls_info;
...@@ -638,9 +635,11 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg ) ...@@ -638,9 +635,11 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg )
case LDAP_OPT_X_TLS_REQUIRE_CERT: case LDAP_OPT_X_TLS_REQUIRE_CERT:
*(int *)arg = lo->ldo_tls_require_cert; *(int *)arg = lo->ldo_tls_require_cert;
break; break;
#ifdef HAVE_OPENSSL_CRL
case LDAP_OPT_X_TLS_CRLCHECK: /* OpenSSL only */ case LDAP_OPT_X_TLS_CRLCHECK: /* OpenSSL only */
*(int *)arg = lo->ldo_tls_crlcheck; *(int *)arg = lo->ldo_tls_crlcheck;
break; break;
#endif
case LDAP_OPT_X_TLS_CIPHER_SUITE: case LDAP_OPT_X_TLS_CIPHER_SUITE:
*(char **)arg = lo->ldo_tls_ciphersuite ? *(char **)arg = lo->ldo_tls_ciphersuite ?
LDAP_STRDUP( lo->ldo_tls_ciphersuite ) : NULL; LDAP_STRDUP( lo->ldo_tls_ciphersuite ) : NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment