Fix extensible filters

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index fe5df23406bb320c7ac215cd03df1e73905390eb..4e1c1fd786d3a20bd95baa34e345ab52ac5e19ae 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -73,12 +73,10 @@ 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 );
+       while ( ld->ld_requests != NULL ) {
+               ldap_free_request( ld, ld->ld_requests );
        }
 
        /* free and unbind from all open connections */
@@ -133,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 );
 }
 
@@ -160,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 );