Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 3e0bbab8f6b8de26d7d558bb807f05ed8f7732c2..cd293d2609db3e09db5ce2ee30592bb7356780bb 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80,25 +80,45 @@ ldap_ld_free(
        LDAPMessage     *lm, *next;
        int             err = LDAP_SUCCESS;
 
+       LDAP_MUTEX_LOCK( &ld->ld_ldcmutex );
+       /* Someone else is still using this ld. */
+       if (ld->ld_ldcrefcnt > 1) {     /* but not last thread */
+               /* clean up self only */
+               ld->ld_ldcrefcnt--;
+               if ( ld->ld_error != NULL ) {
+                       LDAP_FREE( ld->ld_error );
+                       ld->ld_error = NULL;
+               }
+
+               if ( ld->ld_matched != NULL ) {
+                       LDAP_FREE( ld->ld_matched );
+                       ld->ld_matched = NULL;
+               }
+               if ( ld->ld_referrals != NULL) {
+                       LDAP_VFREE(ld->ld_referrals);
+                       ld->ld_referrals = NULL;
+               }  
+               LDAP_MUTEX_UNLOCK( &ld->ld_ldcmutex );
+               LDAP_FREE( (char *) ld );
+               return( err );
+       }
+
+       /* This ld is the last thread. */
+
        /* free LDAP structure and outstanding requests/responses */
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
-#endif
+       LDAP_MUTEX_LOCK( &ld->ld_req_mutex );
        while ( ld->ld_requests != NULL ) {
                ldap_free_request( ld, ld->ld_requests );
        }
+       LDAP_MUTEX_UNLOCK( &ld->ld_req_mutex );
+       LDAP_MUTEX_LOCK( &ld->ld_conn_mutex );
 
        /* free and unbind from all open connections */
        while ( ld->ld_conns != NULL ) {
                ldap_free_connection( ld, ld->ld_conns, 1, close );
        }
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
-#endif
-
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex );
-#endif
+       LDAP_MUTEX_UNLOCK( &ld->ld_conn_mutex );
+       LDAP_MUTEX_LOCK( &ld->ld_res_mutex );
        for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
                next = lm->lm_next;
                ldap_msgfree( lm );
@@ -108,9 +128,23 @@ ldap_ld_free(
                LDAP_FREE( ld->ld_abandoned );
                ld->ld_abandoned = NULL;
        }
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
-#endif
+       LDAP_MUTEX_UNLOCK( &ld->ld_res_mutex );
+
+       ber_sockbuf_free( ld->ld_sb );
+
+       LDAP_MUTEX_LOCK( &ld->ld_ldopts_mutex );
+
+       /* final close callbacks */
+       {
+               ldaplist *ll, *next;
+
+               for ( ll = ld->ld_options.ldo_conn_cbs; ll; ll = next ) {
+                       ldap_conncb *cb = ll->ll_data;
+                       next = ll->ll_next;
+                       cb->lc_del( ld, NULL, cb );
+                       LDAP_FREE( ll );
+               }
+       }
 
        if ( ld->ld_error != NULL ) {
                LDAP_FREE( ld->ld_error );
@@ -122,7 +156,7 @@ ldap_ld_free(
                ld->ld_matched = NULL;
        }
 
-       if( ld->ld_referrals != NULL) {
+       if ( ld->ld_referrals != NULL) {
                LDAP_VFREE(ld->ld_referrals);
                ld->ld_referrals = NULL;
        }  
@@ -142,6 +176,11 @@ ldap_ld_free(
                LDAP_FREE( ld->ld_options.ldo_peer );
                ld->ld_options.ldo_peer = NULL;
        }
+
+       if ( ld->ld_options.ldo_cldapdn != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_cldapdn );
+               ld->ld_options.ldo_cldapdn = NULL;
+       }
 #endif
 
 #ifdef HAVE_CYRUS_SASL
@@ -179,22 +218,33 @@ ldap_ld_free(
                ldap_controls_free( ld->ld_options.ldo_cctrls );
                ld->ld_options.ldo_cctrls = NULL;
        }
+       LDAP_MUTEX_UNLOCK( &ld->ld_ldopts_mutex );
 
-       ber_sockbuf_free( ld->ld_sb );   
-   
 #ifdef LDAP_R_COMPILE
+       ldap_pvt_thread_mutex_destroy( &ld->ld_msgid_mutex );
+       ldap_pvt_thread_mutex_destroy( &ld->ld_conn_mutex );
        ldap_pvt_thread_mutex_destroy( &ld->ld_req_mutex );
        ldap_pvt_thread_mutex_destroy( &ld->ld_res_mutex );
-       ldap_pvt_thread_mutex_destroy( &ld->ld_conn_mutex );
+       ldap_pvt_thread_mutex_destroy( &ld->ld_abandon_mutex );
+       ldap_pvt_thread_mutex_destroy( &ld->ld_ldopts_mutex );
+       ldap_pvt_thread_mutex_unlock( &ld->ld_ldcmutex );
+       ldap_pvt_thread_mutex_destroy( &ld->ld_ldcmutex );
 #endif
 #ifndef NDEBUG
        LDAP_TRASH(ld);
 #endif
+       LDAP_FREE( (char *) ld->ldc );
        LDAP_FREE( (char *) ld );
    
        return( err );
 }
 
+int
+ldap_destroy( LDAP *ld )
+{
+       return ( ldap_ld_free( ld, 1, NULL, NULL ) );
+}
+
 int
 ldap_unbind_s( LDAP *ld )
 {
@@ -224,7 +274,7 @@ ldap_send_unbind(
                return( ld->ld_errno );
        }
 
-       id = ++(ld)->ld_msgid;
+       LDAP_NEXT_MSGID(ld, id);
 
        /* fill it in */
        if ( ber_printf( ber, "{itn" /*}*/, id,