X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=libraries%2Flibldap%2Funbind.c;h=162f03424ff0813f80b9df9b16de20c2e50f496b;hb=4d29df5bd1fabcdc50975651c746365686b62b53;hp=c9f14ec34a9c8d5d85711c2f9a0711ebc120b89e;hpb=042898d2f0bc21a3f8c755ddc0f49487b4a12dee;p=openldap
diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index c9f14ec34a..162f03424f 100644
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,18 +1,35 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
- * All rights reserved.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
+ */
+/* Portions Copyright (C) The Internet Society (1997)
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
+ */
+
+/* An Unbind Request looks like this:
*
- * unbind.c
+ * UnbindRequest ::= NULL
+ *
+ * and has no response.
*/
#include "portable.h"
#include
-#include
+#include
#include
#include
@@ -26,13 +43,35 @@ 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 )
{
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, "ldap_unbind\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_unbind\n", 0, 0, 0 );
+#endif
return( ldap_unbind_ext( ld, NULL, NULL ) );
}
@@ -47,104 +86,104 @@ 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 */
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
+#endif
+ while ( ld->ld_requests != NULL ) {
+ ldap_free_request( ld, ld->ld_requests );
+ }
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
+#endif
+
+ /* free and unbind from all open connections */
+ while ( ld->ld_conns != NULL ) {
+ ldap_free_connection( ld, ld->ld_conns, 1, close );
}
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_res_mutex );
+#endif
for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
next = lm->lm_next;
ldap_msgfree( lm );
}
-
-#ifndef LDAP_NOCACHE
- if ( ld->ld_cache != NULL ) {
- ldap_destroy_cache( ld );
- ld->ld_cache = NULL;
- }
-#endif /* !LDAP_NOCACHE */
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_res_mutex );
+#endif
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 );
- ld->ld_host = NULL;
+ if( ld->ld_referrals != NULL) {
+ LDAP_VFREE(ld->ld_referrals);
+ ld->ld_referrals = NULL;
+ }
+
+ if ( ld->ld_abandoned != NULL ) {
+ LDAP_FREE( ld->ld_abandoned );
+ ld->ld_abandoned = NULL;
}
- if ( ld->ld_ufnprefix != NULL ) {
- free( ld->ld_ufnprefix );
- ld->ld_ufnprefix = NULL;
+ if ( ld->ld_selectinfo != NULL ) {
+ ldap_free_select_info( ld->ld_selectinfo );
+ ld->ld_selectinfo = NULL;
}
- if ( ld->ld_filtd != NULL ) {
- ldap_getfilter_free( ld->ld_filtd );
- ld->ld_filtd = 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_abandoned != NULL ) {
- free( ld->ld_abandoned );
- ld->ld_abandoned = NULL;
+ if ( ld->ld_options.ldo_tm_api != NULL ) {
+ LDAP_FREE( ld->ld_options.ldo_tm_api );
+ ld->ld_options.ldo_tm_api = NULL;
}
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
- if ( ld->ld_selectinfo != NULL ) {
- ldap_free_select_info( ld->ld_selectinfo );
- ld->ld_selectinfo = NULL;
+ 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;
}
-#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 );
- ld->ld_options.ldo_defbase = NULL;
+ 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_defhost != NULL ) {
- free( ld->ld_options.ldo_defhost );
- ld->ld_options.ldo_defhost = 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 );
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_destroy( &ld->ld_req_mutex );
+ ldap_pvt_thread_mutex_destroy( &ld->ld_res_mutex );
+#endif
+ LDAP_FREE( (char *) ld );
- WSACleanup();
-
return( err );
}
@@ -163,16 +202,26 @@ ldap_send_unbind(
LDAPControl **cctrls )
{
BerElement *ber;
+ ber_int_t id;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, "ldap_send_unbind\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "ldap_send_unbind\n", 0, 0, 0 );
+#endif
+#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 );
}
+ LDAP_NEXT_MSGID( ld, id );
/* fill it in */
- if ( ber_printf( ber, "{itn", ++ld->ld_msgid,
+ if ( ber_printf( ber, "{itn" /*}*/, id,
LDAP_REQ_UNBIND ) == -1 ) {
ld->ld_errno = LDAP_ENCODING_ERROR;
ber_free( ber, 1 );
@@ -185,19 +234,24 @@ 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 );
}
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
+#endif
+ ld->ld_errno = LDAP_SUCCESS;
/* send the message */
if ( ber_flush( sb, ber, 1 ) == -1 ) {
ld->ld_errno = LDAP_SERVER_DOWN;
ber_free( ber, 1 );
- return( ld->ld_errno );
}
+#ifdef LDAP_R_COMPILE
+ ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
+#endif
- return( LDAP_SUCCESS );
+ return( ld->ld_errno );
}