Added LDAP_LOG messages

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 0d5f3fe46ac3204488e8d7443cc2514fbb3e6a83..b2a35e9c5c0c4877017d8c709c8ade3c2e60440b 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -36,6 +36,9 @@ ldap_unbind_ext(
 {
        int rc;
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
        /* check client controls */
        rc = ldap_int_client_controls( ld, cctrls );
        if( rc != LDAP_SUCCESS ) return rc;
@@ -70,18 +73,16 @@ ldap_ld_free(
 {
        LDAPMessage     *lm, *next;
        int             err = LDAP_SUCCESS;
-       LDAPRequest     *lr, *nextlr;
 
-               /* free LDAP structure and outstanding requests/responses */
-               for ( lr = ld->ld_requests; lr != NULL; lr = nextlr ) {
-                       nextlr = lr->lr_next;
-                       ldap_free_request( ld, lr );
-               }
+       /* free LDAP structure and outstanding requests/responses */
+       while ( ld->ld_requests != NULL ) {
+               ldap_free_request( ld, ld->ld_requests );
+       }
 
-               /* free and unbind from all open connections */
-               while ( ld->ld_conns != NULL ) {
-                       ldap_free_connection( ld, ld->ld_conns, 1, close );
-               }
+       /* free and unbind from all open connections */
+       while ( ld->ld_conns != NULL ) {
+               ldap_free_connection( ld, ld->ld_conns, 1, close );
+       }
 
        for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
                next = lm->lm_next;
@@ -130,12 +131,32 @@ ldap_ld_free(
                ld->ld_options.ldo_tm_net = NULL;
        }
 
+#ifdef HAVE_CYRUS_SASL
+       if ( ld->ld_options.ldo_def_sasl_mech != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_mech );
+               ld->ld_options.ldo_def_sasl_mech = NULL;
+       }
+
+       if ( ld->ld_options.ldo_def_sasl_realm != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_realm );
+               ld->ld_options.ldo_def_sasl_realm = NULL;
+       }
+
+       if ( ld->ld_options.ldo_def_sasl_authcid != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_authcid );
+               ld->ld_options.ldo_def_sasl_authcid = NULL;
+       }
+
+       if ( ld->ld_options.ldo_def_sasl_authzid != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_authzid );
+               ld->ld_options.ldo_def_sasl_authzid = NULL;
+       }
+#endif
+
        ber_sockbuf_free( ld->ld_sb );   
    
        LDAP_FREE( (char *) ld );
    
-       WSACleanup();
-
        return( err );
 }
 
@@ -157,6 +178,10 @@ ldap_send_unbind(
 
        Debug( LDAP_DEBUG_TRACE, "ldap_send_unbind\n", 0, 0, 0 );
 
+#ifdef LDAP_CONNECTIONLESS
+       if (LDAP_IS_UDP(ld))
+               return LDAP_SUCCESS;
+#endif
        /* create a message to send */
        if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                return( ld->ld_errno );