X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Funbind.c;h=7fd116f76048f781cfb36f115ceb949a71a0d2f9;hb=55dba4395f81f75ad8f247d3c0fad7119fe1ea9d;hp=7f17a1bb7363c24306d15a0f2caf251fcd59f363;hpb=a81ca188454b343e91568d49c0ac408660dcb66c;p=openldap

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 7f17a1bb73..7fd116f760 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-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>
@@ -20,27 +28,36 @@
 
 #include "ldap-int.h"
 
+int
+ldap_unbind_ext(
+	LDAP *ld,
+	LDAPControl **sctrls,
+	LDAPControl **cctrls )
+{
+	return ldap_ld_free( ld, 1, sctrls, cctrls );
+}
 
 int
 ldap_unbind( LDAP *ld )
 {
 	Debug( LDAP_DEBUG_TRACE, "ldap_unbind\n", 0, 0, 0 );
 
-	return( ldap_ld_free( ld, 1 ));
+	return( ldap_unbind_ext( ld, NULL, NULL ) );
 }
 
 
 int
-ldap_ld_free( LDAP *ld, int close )
+ldap_ld_free(
+	LDAP *ld,
+	int close,
+	LDAPControl **sctrls,
+	LDAPControl **cctrls )
 {
 	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;
@@ -51,19 +68,13 @@ ldap_ld_free( LDAP *ld, int close )
 		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 );
-			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 ] );
+			LDAP_FREE( ld->ld_cldapaddrs[ i ] );
 		}
-		free( ld->ld_cldapaddrs );
+		LDAP_FREE( ld->ld_cldapaddrs );
 	}
 
 	for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
@@ -72,38 +83,71 @@ ldap_ld_free( LDAP *ld, int close )
 	}
 
 #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 )
+
+	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_host != NULL ) {
+		LDAP_FREE( ld->ld_host );
+		ld->ld_host = NULL;
+	}
+
+	if ( ld->ld_ufnprefix != NULL ) {
+		LDAP_FREE( ld->ld_ufnprefix );
+		ld->ld_ufnprefix = NULL;
+	}
+
+	if ( ld->ld_filtd != NULL ) {
 		ldap_getfilter_free( ld->ld_filtd );
-	if ( ld->ld_abandoned != NULL )
-		free( ld->ld_abandoned );
+		ld->ld_filtd = NULL;
+	}
+
+	if ( ld->ld_abandoned != NULL ) {
+		LDAP_FREE( ld->ld_abandoned );
+		ld->ld_abandoned = NULL;
+	}
 
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-	if ( ld->ld_selectinfo != 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_defbase != NULL )
-		free( ld->ld_options.ldo_defbase );
+	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_tm_net != NULL ) {
+		LDAP_FREE( ld->ld_options.ldo_tm_net );
+		ld->ld_options.ldo_tm_net = NULL;
+	}
 
-	if ( ld->ld_options.ldo_defhost != NULL )
-		free( ld->ld_options.ldo_defhost );
+#ifdef HAVE_CYRUS_SASL
+	if ( ld->ld_sasl_context != NULL ) {
+		sasl_dispose( &ld->ld_sasl_context );
+	}
+#endif 
 
-	lber_pvt_sb_destroy( &(ld->ld_sb) );   
+	ber_sockbuf_free( ld->ld_sb );   
    
-	free( (char *) ld );
+	LDAP_FREE( (char *) ld );
    
 	WSACleanup();
 
@@ -113,30 +157,46 @@ ldap_ld_free( LDAP *ld, int close )
 int
 ldap_unbind_s( LDAP *ld )
 {
-	return( ldap_ld_free( ld, 1 ));
+	return( ldap_unbind_ext( ld, NULL, NULL ) );
 }
 
 
 int
-ldap_send_unbind( LDAP *ld, Sockbuf *sb )
+ldap_send_unbind(
+	LDAP *ld,
+	Sockbuf *sb,
+	LDAPControl **sctrls,
+	LDAPControl **cctrls )
 {
 	BerElement	*ber;
 
 	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 );
 		return( ld->ld_errno );
 	}
 
+	/* Put Server Controls */
+	if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
+		ber_free( ber, 1 );
+		return ld->ld_errno;
+	}
+
+	if ( ber_printf( ber, /*{*/ "}", LDAP_REQ_UNBIND ) == -1 ) {
+		ld->ld_errno = LDAP_ENCODING_ERROR;
+		ber_free( ber, 1 );
+		return( ld->ld_errno );
+	}
+
 	/* send the message */
 	if ( ber_flush( sb, ber, 1 ) == -1 ) {
 		ld->ld_errno = LDAP_SERVER_DOWN;