Don't ignore all Makefiles

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 38a8e67a8af1cb41eb1a8207d9e173bcdf4c3704..d6f247d9004a15cde8637be0cfeb73ce3ae96988 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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,16 +15,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
-
-/* An Unbind Request looks like this:
- *
- *     UnbindRequest ::= NULL
- *
- * and has no response.
- */
 
 #include "portable.h"
 
@@ -37,6 +27,13 @@
 
 #include "ldap-int.h"
 
+/* An Unbind Request looks like this:
+ *
+ *     UnbindRequest ::= [APPLICATION 2] NULL
+ *
+ * and has no response.  (Source: RFC 4511)
+ */
+
 int
 ldap_unbind_ext(
        LDAP *ld,
@@ -83,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 );
@@ -111,9 +128,20 @@ 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 );
+       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 );
@@ -125,7 +153,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;
        }  
@@ -145,17 +173,12 @@ ldap_ld_free(
                LDAP_FREE( ld->ld_options.ldo_peer );
                ld->ld_options.ldo_peer = NULL;
        }
-#endif
 
-       if ( ld->ld_options.ldo_tm_api != NULL ) {
-               LDAP_FREE( ld->ld_options.ldo_tm_api );
-               ld->ld_options.ldo_tm_api = NULL;
-       }
-
-       if ( ld->ld_options.ldo_tm_net != NULL ) {
-               LDAP_FREE( ld->ld_options.ldo_tm_net );
-               ld->ld_options.ldo_tm_net = 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
        if ( ld->ld_options.ldo_def_sasl_mech != NULL ) {
@@ -192,22 +215,35 @@ 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 )
 {
@@ -237,7 +273,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,
@@ -261,7 +297,7 @@ ldap_send_unbind(
 
        ld->ld_errno = LDAP_SUCCESS;
        /* send the message */
-       if ( ber_flush( sb, ber, 1 ) == -1 ) {
+       if ( ber_flush2( sb, ber, LBER_FLUSH_FREE_ALWAYS ) == -1 ) {
                ld->ld_errno = LDAP_SERVER_DOWN;
        }