X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Funbind.c;h=b2a35e9c5c0c4877017d8c709c8ade3c2e60440b;hb=fff5d3de601a7a980cf7554e3f2e6f4d7ceda834;hp=fb1c2e4d4d4f2d8b3edb289c71c787cffdf9d7f5;hpb=dc07e765f263ef459dcd2afd1ece01cfc85a0edd;p=openldap

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index fb1c2e4d4d..b2a35e9c5c 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-2002 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>
@@ -26,9 +34,27 @@ ldap_unbind_ext(
 	LDAPControl **sctrls,
 	LDAPControl **cctrls )
 {
+	int rc;
+
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+
+	/* check client controls */
+	rc = ldap_int_client_controls( ld, cctrls );
+	if( rc != LDAP_SUCCESS ) return rc;
+
 	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 )
 {
@@ -47,35 +73,15 @@ ldap_ld_free(
 {
 	LDAPMessage	*lm, *next;
 	int		err = LDAP_SUCCESS;
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-	LDAPRequest	*lr, *nextlr;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_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;
-			ldap_free_request( ld, lr );
-		}
-
-		/* free and unbind from all open connections */
-		while ( ld->ld_conns != NULL ) {
-			ldap_free_connection( ld, ld->ld_conns, 1, close );
-		}
-#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
-		if ( close ) {
-			err = ldap_send_unbind( ld, &ld->ld_sb, sctrls, cctrls );
-			ldap_close_connection( &ld->ld_sb );
-		}
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
-	} else {
-		int	i;
-
-		for ( i = 0; i < ld->ld_cldapnaddr; ++i ) {
-			free( ld->ld_cldapaddrs[ i ] );
-		}
-		free( ld->ld_cldapaddrs );
+
+	/* free LDAP structure and outstanding requests/responses */
+	while ( ld->ld_requests != NULL ) {
+		ldap_free_request( ld, ld->ld_requests );
+	}
+
+	/* free and unbind from all open connections */
+	while ( ld->ld_conns != NULL ) {
+		ldap_free_connection( ld, ld->ld_conns, 1, close );
 	}
 
 	for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
@@ -84,41 +90,73 @@ ldap_ld_free(
 	}
 
 #ifndef LDAP_NOCACHE
-	if ( ld->ld_cache != NULL )
+	if ( ld->ld_cache != NULL ) {
 		ldap_destroy_cache( ld );
+		ld->ld_cache = NULL;
+	}
 #endif /* !LDAP_NOCACHE */
-	if ( ld->ld_error != NULL )
-		free( ld->ld_error );
-	if ( ld->ld_matched != NULL )
-		free( ld->ld_matched );
-	if ( ld->ld_host != NULL )
-		free( ld->ld_host );
-	if ( ld->ld_ufnprefix != NULL )
-		free( ld->ld_ufnprefix );
-	if ( ld->ld_filtd != NULL )
-		ldap_getfilter_free( ld->ld_filtd );
-	if ( ld->ld_abandoned != NULL )
-		free( ld->ld_abandoned );
-
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-	if ( ld->ld_selectinfo != NULL )
+
+	if ( ld->ld_error != NULL ) {
+		LDAP_FREE( ld->ld_error );
+		ld->ld_error = NULL;
+	}
+
+	if ( ld->ld_matched != NULL ) {
+		LDAP_FREE( ld->ld_matched );
+		ld->ld_matched = NULL;
+	}
+
+	if ( ld->ld_abandoned != NULL ) {
+		LDAP_FREE( ld->ld_abandoned );
+		ld->ld_abandoned = NULL;
+	}
+
+	if ( ld->ld_selectinfo != NULL ) {
 		ldap_free_select_info( ld->ld_selectinfo );
-#else
-	ber_clear( &(ld->ld_ber), 1 );
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+		ld->ld_selectinfo = 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_defbase != NULL )
-		free( ld->ld_options.ldo_defbase );
+	if ( ld->ld_options.ldo_tm_net != NULL ) {
+		LDAP_FREE( ld->ld_options.ldo_tm_net );
+		ld->ld_options.ldo_tm_net = NULL;
+	}
+
+#ifdef HAVE_CYRUS_SASL
+	if ( ld->ld_options.ldo_def_sasl_mech != NULL ) {
+		LDAP_FREE( ld->ld_options.ldo_def_sasl_mech );
+		ld->ld_options.ldo_def_sasl_mech = NULL;
+	}
+
+	if ( ld->ld_options.ldo_def_sasl_realm != NULL ) {
+		LDAP_FREE( ld->ld_options.ldo_def_sasl_realm );
+		ld->ld_options.ldo_def_sasl_realm = NULL;
+	}
 
-	if ( ld->ld_options.ldo_defhost != NULL )
-		free( ld->ld_options.ldo_defhost );
+	if ( ld->ld_options.ldo_def_sasl_authcid != NULL ) {
+		LDAP_FREE( ld->ld_options.ldo_def_sasl_authcid );
+		ld->ld_options.ldo_def_sasl_authcid = NULL;
+	}
+
+	if ( ld->ld_options.ldo_def_sasl_authzid != NULL ) {
+		LDAP_FREE( ld->ld_options.ldo_def_sasl_authzid );
+		ld->ld_options.ldo_def_sasl_authzid = NULL;
+	}
+#endif
 
-	ber_pvt_sb_destroy( &(ld->ld_sb) );   
+	ber_sockbuf_free( ld->ld_sb );   
    
-	free( (char *) ld );
+	LDAP_FREE( (char *) ld );
    
-	WSACleanup();
-
 	return( err );
 }
 
@@ -140,13 +178,17 @@ ldap_send_unbind(
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_send_unbind\n", 0, 0, 0 );
 
+#ifdef LDAP_CONNECTIONLESS
+	if (LDAP_IS_UDP(ld))
+		return LDAP_SUCCESS;
+#endif
 	/* 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 );
@@ -159,8 +201,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 );