+/* $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
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 ) {
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 );