Move serverID into a Global configuration section.

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index c58d7a2a0a4df75f0b68ade6df1b8642f81ce53d..42277bb6f11eb377ff20b43c5a9e86837af0838a 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2008 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,
@@ -90,14 +87,14 @@ ldap_ld_free(
        while ( ld->ld_requests != NULL ) {
                ldap_free_request( ld, ld->ld_requests );
        }
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
-#endif
 
        /* 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 );
@@ -106,6 +103,11 @@ ldap_ld_free(
                next = lm->lm_next;
                ldap_msgfree( lm );
        }
+    
+       if ( ld->ld_abandoned != NULL ) {
+               LDAP_FREE( ld->ld_abandoned );
+               ld->ld_abandoned = NULL;
+       }
 #ifdef LDAP_R_COMPILE
        ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
 #endif
@@ -125,11 +127,6 @@ ldap_ld_free(
                ld->ld_referrals = NULL;
        }  
     
-       if ( ld->ld_abandoned != NULL ) {
-               LDAP_FREE( ld->ld_abandoned );
-               ld->ld_abandoned = NULL;
-       }
-
        if ( ld->ld_selectinfo != NULL ) {
                ldap_free_select_info( ld->ld_selectinfo );
                ld->ld_selectinfo = NULL;
@@ -140,15 +137,12 @@ ldap_ld_free(
                ld->ld_options.ldo_defludp = NULL;
        }
 
-       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;
+#ifdef LDAP_CONNECTIONLESS
+       if ( ld->ld_options.ldo_peer != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_peer );
+               ld->ld_options.ldo_peer = NULL;
        }
+#endif
 
 #ifdef HAVE_CYRUS_SASL
        if ( ld->ld_options.ldo_def_sasl_mech != NULL ) {
@@ -172,6 +166,10 @@ ldap_ld_free(
        }
 #endif
 
+#ifdef HAVE_TLS
+       ldap_int_tls_destroy( &ld->ld_options );
+#endif
+
        if ( ld->ld_options.ldo_sctrls != NULL ) {
                ldap_controls_free( ld->ld_options.ldo_sctrls );
                ld->ld_options.ldo_sctrls = NULL;
@@ -187,6 +185,10 @@ ldap_ld_free(
 #ifdef LDAP_R_COMPILE
        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 );
+#endif
+#ifndef NDEBUG
+       LDAP_TRASH(ld);
 #endif
        LDAP_FREE( (char *) ld );
    
@@ -199,7 +201,8 @@ ldap_unbind_s( LDAP *ld )
        return( ldap_unbind_ext( ld, NULL, NULL ) );
 }
 
-
+/* FIXME: this function is called only by ldap_free_connection(),
+ * which, most of the times, is called with ld_req_mutex locked */
 int
 ldap_send_unbind(
        LDAP *ld,
@@ -221,7 +224,8 @@ ldap_send_unbind(
                return( ld->ld_errno );
        }
 
-       LDAP_NEXT_MSGID( ld, id );
+       id = ++(ld)->ld_msgid;
+
        /* fill it in */
        if ( ber_printf( ber, "{itn" /*}*/, id,
            LDAP_REQ_UNBIND ) == -1 ) {
@@ -242,18 +246,11 @@ ldap_send_unbind(
                return( ld->ld_errno );
        }
 
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
-#endif
        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;
-               ber_free( ber, 1 );
        }
-#ifdef LDAP_R_COMPILE
-       ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
-#endif
 
        return( ld->ld_errno );
 }