cleanup

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 0d89a5920003072ef0d2a991582f732a0fc77633..5c6c324eefbe6d70091ca41abf8b431658e6e1df 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
@@ -9,10 +10,17 @@
  *  unbind.c
  */
 
+/* An Unbind Request looks like this:
+ *
+ *     UnbindRequest ::= NULL
+ *
+ * and has no response.
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -29,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 )
 {
@@ -49,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;
@@ -60,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 ) {
-                       free( ld->ld_cldapaddrs[ i ] );
-               }
-               free( ld->ld_cldapaddrs );
-       }
 
        for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
                next = lm->lm_next;
@@ -82,22 +90,22 @@ ldap_ld_free(
 #endif /* !LDAP_NOCACHE */
 
        if ( ld->ld_error != NULL ) {
-               free( ld->ld_error );
+               LDAP_FREE( ld->ld_error );
                ld->ld_error = NULL;
        }
 
        if ( ld->ld_matched != NULL ) {
-               free( ld->ld_matched );
+               LDAP_FREE( ld->ld_matched );
                ld->ld_matched = NULL;
        }
 
        if ( ld->ld_host != NULL ) {
-               free( ld->ld_host );
+               LDAP_FREE( ld->ld_host );
                ld->ld_host = NULL;
        }
 
        if ( ld->ld_ufnprefix != NULL ) {
-               free( ld->ld_ufnprefix );
+               LDAP_FREE( ld->ld_ufnprefix );
                ld->ld_ufnprefix = NULL;
        }
 
@@ -107,7 +115,7 @@ ldap_ld_free(
        }
 
        if ( ld->ld_abandoned != NULL ) {
-               free( ld->ld_abandoned );
+               LDAP_FREE( ld->ld_abandoned );
                ld->ld_abandoned = NULL;
        }
 
@@ -116,19 +124,24 @@ ldap_ld_free(
                ld->ld_selectinfo = NULL;
        }
 
-       if ( ld->ld_options.ldo_defbase != NULL ) {
-               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_tm_api != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_tm_api );
+               ld->ld_options.ldo_tm_api = NULL;
        }
 
-       if ( ld->ld_options.ldo_defhost != NULL ) {
-               free( ld->ld_options.ldo_defhost );
-               ld->ld_options.ldo_defhost = NULL;
+       if ( ld->ld_options.ldo_tm_net != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_tm_net );
+               ld->ld_options.ldo_tm_net = NULL;
        }
 
-       ber_pvt_sb_destroy( &(ld->ld_sb) );   
+       ber_sockbuf_free( ld->ld_sb );   
    
-       free( (char *) ld );
+       LDAP_FREE( (char *) ld );
    
        WSACleanup();
 
@@ -154,12 +167,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 );
@@ -172,8 +185,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 );