cleanup

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 98a559669f087e3ef0084ec217e036b3839856d9..5c6c324eefbe6d70091ca41abf8b431658e6e1df 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -66,7 +66,6 @@ ldap_ld_free(
        int             err = LDAP_SUCCESS;
        LDAPRequest     *lr, *nextlr;
 
-       if ( ld->ld_cldapnaddr == 0 ) {
                /* free LDAP structure and outstanding requests/responses */
                for ( lr = ld->ld_requests; lr != NULL; lr = nextlr ) {
                        nextlr = lr->lr_next;
@@ -77,14 +76,6 @@ ldap_ld_free(
                while ( ld->ld_conns != NULL ) {
                        ldap_free_connection( ld, ld->ld_conns, 1, close );
                }
-       } else {
-               int     i;
-
-               for ( i = 0; i < ld->ld_cldapnaddr; ++i ) {
-                       LDAP_FREE( ld->ld_cldapaddrs[ i ] );
-               }
-               LDAP_FREE( ld->ld_cldapaddrs );
-       }
 
        for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
                next = lm->lm_next;
@@ -148,12 +139,6 @@ ldap_ld_free(
                ld->ld_options.ldo_tm_net = NULL;
        }
 
-#ifdef HAVE_CYRUS_SASL
-       if ( ld->ld_sasl_context != NULL ) {
-               sasl_dispose( &ld->ld_sasl_context );
-       }
-#endif 
-
        ber_sockbuf_free( ld->ld_sb );   
    
        LDAP_FREE( (char *) ld );