Sync with HEAD

[openldap] / servers / slapd / back-ldap / init.c

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 49837a167f62d8b6334e5295d2b108dbac3d2916..f250f6d0d99a1d2cd42403eb7e7bd8abbeddabf2 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -204,7 +204,7 @@ ldap_back_conn_free( void *v_lc )
        struct ldapconn *lc = v_lc;
 
        if ( lc->lc_ld != NULL ) {      
-               ldap_unbind_ext_s( lc->lc_ld, NULL, NULL );
+               ldap_unbind_ext( lc->lc_ld, NULL, NULL );
        }
        if ( !BER_BVISNULL( &lc->lc_bound_ndn ) ) {
                ch_free( lc->lc_bound_ndn.bv_val );
@@ -216,7 +216,6 @@ ldap_back_conn_free( void *v_lc )
        if ( !BER_BVISNULL( &lc->lc_local_ndn ) ) {
                ch_free( lc->lc_local_ndn.bv_val );
        }
-       ldap_pvt_thread_mutex_destroy( &lc->lc_mutex );
        ch_free( lc );
 }
 
@@ -284,6 +283,10 @@ ldap_back_db_destroy(
                        ch_free( li->idassert_sasl_realm.bv_val );
                        BER_BVZERO( &li->idassert_sasl_realm );
                }
+               if ( li->idassert_authz != NULL ) {
+                       ber_bvarray_free( li->idassert_authz );
+                       li->idassert_authz = NULL;
+               }
                 if ( li->conntree ) {
                        avl_free( li->conntree, ldap_back_conn_free );
                }