Merged in preliminary support for Cyrus SASL library;

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 852926f785304f7c45660f9dcbb91e8ff55d20d7..c4222fe4ab7e90978e3a44ee95c60fd9eff51688 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -124,14 +124,9 @@ ldap_ld_free(
                ld->ld_selectinfo = NULL;
        }
 
-       if ( ld->ld_options.ldo_defbase != NULL ) {
-               LDAP_FREE( ld->ld_options.ldo_defbase );
-               ld->ld_options.ldo_defbase = NULL;
-       }
-
-       if ( ld->ld_options.ldo_defhost != NULL ) {
-               LDAP_FREE( ld->ld_options.ldo_defhost );
-               ld->ld_options.ldo_defhost = NULL;
+       if ( ld->ld_options.ldo_defludp != NULL ) {
+               ldap_free_urllist( ld->ld_options.ldo_defludp );
+               ld->ld_options.ldo_defludp = NULL;
        }
 
        if ( ld->ld_options.ldo_tm_api != NULL ) {
@@ -144,6 +139,12 @@ 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_pvt_sb_destroy( &(ld->ld_sb) );   
    
        LDAP_FREE( (char *) ld );