Cast char* argument to hh_to_c() to Byte*

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index e7b5c401e6f2c8b28be7b23950286e5a4649ad73..7f17a1bb7363c24306d15a0f2caf251fcd59f363 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,34 +1,23 @@
 /*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/*  Portions
  *  Copyright (c) 1990 Regents of the University of Michigan.
  *  All rights reserved.
  *
  *  unbind.c
  */
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
+#include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#ifdef MACOS
 #include <stdlib.h>
-#include "macos.h"
-#else /* MACOS */
-#if defined( DOS ) || defined( _WIN32 )
-#include "msdos.h"
-#ifdef NCSA
-#include "externs.h"
-#endif /* NCSA */
-#else /* DOS */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#endif /* DOS */
-#endif /* MACOS */
-
-#include "lber.h"
-#include "ldap.h"
+
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
 #include "ldap-int.h"
 
 
@@ -46,36 +35,35 @@ ldap_ld_free( LDAP *ld, int close )
 {
        LDAPMessage     *lm, *next;
        int             err = LDAP_SUCCESS;
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        LDAPRequest     *lr, *nextlr;
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
-       if ( ld->ld_sb.sb_naddr == 0 ) {
-#ifdef LDAP_REFERRALS
+       if ( ld->ld_cldapnaddr == 0 ) {
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
                /* free LDAP structure and outstanding requests/responses */
                for ( lr = ld->ld_requests; lr != NULL; lr = nextlr ) {
                        nextlr = lr->lr_next;
-                       free_request( ld, lr );
+                       ldap_free_request( ld, lr );
                }
 
                /* free and unbind from all open connections */
                while ( ld->ld_conns != NULL ) {
-                       free_connection( ld, ld->ld_conns, 1, close );
+                       ldap_free_connection( ld, ld->ld_conns, 1, close );
                }
-#else /* LDAP_REFERRALS */
+#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
                if ( close ) {
-                       err = send_unbind( ld, &ld->ld_sb );
-                       close_connection( &ld->ld_sb );
+                       err = ldap_send_unbind( ld, &ld->ld_sb );
+                       ldap_close_connection( &ld->ld_sb );
                }
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
        } else {
                int     i;
 
-               for ( i = 0; i < ld->ld_sb.sb_naddr; ++i ) {
-                       free( ld->ld_sb.sb_addrs[ i ] );
+               for ( i = 0; i < ld->ld_cldapnaddr; ++i ) {
+                       free( ld->ld_cldapaddrs[ i ] );
                }
-               free( ld->ld_sb.sb_addrs );
-               free( ld->ld_sb.sb_fromaddr );
+               free( ld->ld_cldapaddrs );
        }
 
        for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
@@ -83,10 +71,10 @@ ldap_ld_free( LDAP *ld, int close )
                ldap_msgfree( lm );
        }
 
-#ifndef NO_CACHE
+#ifndef LDAP_NOCACHE
        if ( ld->ld_cache != NULL )
                ldap_destroy_cache( ld );
-#endif /* !NO_CACHE */
+#endif /* !LDAP_NOCACHE */
        if ( ld->ld_error != NULL )
                free( ld->ld_error );
        if ( ld->ld_matched != NULL )
@@ -97,22 +85,27 @@ ldap_ld_free( LDAP *ld, int close )
                free( ld->ld_ufnprefix );
        if ( ld->ld_filtd != NULL )
                ldap_getfilter_free( ld->ld_filtd );
-#ifndef LDAP_REFERRALS
-       if ( ld->ld_sb.sb_ber.ber_buf != NULL )
-               free( ld->ld_sb.sb_ber.ber_buf );
-#endif /* !LDAP_REFERRALS */
        if ( ld->ld_abandoned != NULL )
                free( ld->ld_abandoned );
 
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        if ( ld->ld_selectinfo != NULL )
-               free_select_info( ld->ld_selectinfo );
-#endif /* LDAP_REFERRALS */
+               ldap_free_select_info( ld->ld_selectinfo );
+#else
+       ber_clear( &(ld->ld_ber), 1 );
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+       if ( ld->ld_options.ldo_defbase != NULL )
+               free( ld->ld_options.ldo_defbase );
 
-       if ( ld->ld_defhost != NULL )
-               free( ld->ld_defhost );
+       if ( ld->ld_options.ldo_defhost != NULL )
+               free( ld->ld_options.ldo_defhost );
 
+       lber_pvt_sb_destroy( &(ld->ld_sb) );   
+   
        free( (char *) ld );
+   
+       WSACleanup();
 
        return( err );
 }
@@ -125,14 +118,14 @@ ldap_unbind_s( LDAP *ld )
 
 
 int
-send_unbind( LDAP *ld, Sockbuf *sb )
+ldap_send_unbind( LDAP *ld, Sockbuf *sb )
 {
        BerElement      *ber;
 
-       Debug( LDAP_DEBUG_TRACE, "send_unbind\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "ldap_send_unbind\n", 0, 0, 0 );
 
        /* create a message to send */
-       if ( (ber = alloc_ber_with_options( ld )) == NULLBER ) {
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
                return( ld->ld_errno );
        }