libraries/libldap/sasl.c - diff

Return to sasl.c CVS log

Up to [OpenLDAP] / libraries / libldap

Diff for /libraries/libldap/sasl.c between versions 1.1.4.8 and 1.38

version 1.1.4.8, 2001/06/25 04:56:08	version 1.38, 2001/09/27 22:18:41
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.1.4.7 2000/10/11 02:29:13 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.37 2001/07/21 21:13:06 kurt Exp $ */
/*	/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 67 ldap_sasl_bind(	Line 67 ldap_sasl_bind(
assert( LDAP_VALID( ld ) );	assert( LDAP_VALID( ld ) );
assert( msgidp != NULL );	assert( msgidp != NULL );

	/* check client controls */
	rc = ldap_int_client_controls( ld, cctrls );
	if( rc != LDAP_SUCCESS ) return rc;

if( msgidp == NULL ) {	if( msgidp == NULL ) {
ld->ld_errno = LDAP_PARAM_ERROR;	ld->ld_errno = LDAP_PARAM_ERROR;
return ld->ld_errno;	return ld->ld_errno;
Line 93 ldap_sasl_bind(	Line 97 ldap_sasl_bind(
return ld->ld_errno;	return ld->ld_errno;
}	}

assert( BER_VALID( ber ) );	assert( LBER_VALID( ber ) );

if( mechanism == LDAP_SASL_SIMPLE ) {	if( mechanism == LDAP_SASL_SIMPLE ) {
/* simple bind */	/* simple bind */
Line 419 ldap_sasl_interactive_bind_s(	Line 423 ldap_sasl_interactive_bind_s(
#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )	#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );	ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );
#endif	#endif
	#ifdef LDAP_CONNECTIONLESS
	if( LDAP_IS_UDP(ld) ) {
	/* Just force it to simple bind, silly to make the user
	* ask all the time. No, we don't ever actually bind, but I'll
	* let the final bind handler take care of saving the cdn.
	*/
	rc = ldap_simple_bind(ld, dn, NULL);
	return rc < 0 ? rc : 0;
	} else
	#endif
if( mechs == NULL \|\| *mechs == '\0' ) {	if( mechs == NULL \|\| *mechs == '\0' ) {
char *smechs;	char *smechs;

Removed from v.1.1.4.8
changed lines
	Added in v.1.38