Update SASL code to reuse context through life of session.

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index b5011978d0589a43db62914274e9517b005cc38c..a0b51a87c720bcd5574340e9cc696c265e5a4eea 100644 (file)
--- 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
@@ -36,6 +37,15 @@ ldap_unbind_ext(
        return ldap_ld_free( ld, 1, sctrls, cctrls );
 }
 
+int
+ldap_unbind_ext_s(
+       LDAP *ld,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls )
+{
+       return ldap_unbind_ext( ld, sctrls, cctrls );
+}
+
 int
 ldap_unbind( LDAP *ld )
 {
@@ -123,17 +133,22 @@ 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_defludp != NULL ) {
+               ldap_free_urllist( ld->ld_options.ldo_defludp );
+               ld->ld_options.ldo_defludp = 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_tm_api != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_tm_api );
+               ld->ld_options.ldo_tm_api = NULL;
        }
 
-       ber_pvt_sb_destroy( &(ld->ld_sb) );   
+       if ( ld->ld_options.ldo_tm_net != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_tm_net );
+               ld->ld_options.ldo_tm_net = NULL;
+       }
+
+       ber_sockbuf_free( ld->ld_sb );   
    
        LDAP_FREE( (char *) ld );
    
@@ -161,12 +176,12 @@ ldap_send_unbind(
        Debug( LDAP_DEBUG_TRACE, "ldap_send_unbind\n", 0, 0, 0 );
 
        /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                return( ld->ld_errno );
        }
 
        /* fill it in */
-       if ( ber_printf( ber, "{itn", ++ld->ld_msgid,
+       if ( ber_printf( ber, "{itn" /*}*/, ++ld->ld_msgid,
            LDAP_REQ_UNBIND ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
@@ -179,8 +194,7 @@ ldap_send_unbind(
                return ld->ld_errno;
        }
 
-       if ( ber_printf( ber, "}", ++ld->ld_msgid,
-           LDAP_REQ_UNBIND ) == -1 ) {
+       if ( ber_printf( ber, /*{*/ "N}", LDAP_REQ_UNBIND ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return( ld->ld_errno );