X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Funbind.c;h=7fd116f76048f781cfb36f115ceb949a71a0d2f9;hb=55dba4395f81f75ad8f247d3c0fad7119fe1ea9d;hp=93ce360d754fb1039499e750eb5336e8fe5cd88d;hpb=1b41dfbce0730bb82fe44e315313d0b35079a7dd;p=openldap

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 93ce360d75..7fd116f760 100644
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -123,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 ) {
@@ -143,7 +139,13 @@ ldap_ld_free(
 		ld->ld_options.ldo_tm_net = NULL;
 	}
 
-	ber_pvt_sb_destroy( &(ld->ld_sb) );   
+#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 );