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.41 and 1.41.2.8

version 1.41, 2002/01/04 20:17:39	version 1.41.2.8, 2004/01/21 08:03:23
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.40 2001/12/18 00:24:31 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.41.2.7 2003/05/22 22:22:41 kurt Exp $ */
/*	/*
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/	*/

Line 61 ldap_sasl_bind(	Line 61 ldap_sasl_bind(
BerElement *ber;	BerElement *ber;
int rc;	int rc;

	#ifdef NEW_LOGGING
	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind\n", 0, 0, 0 );
	#else
Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );	Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 );
	#endif

assert( ld != NULL );	assert( ld != NULL );
assert( LDAP_VALID( ld ) );	assert( LDAP_VALID( ld ) );
Line 71 ldap_sasl_bind(	Line 75 ldap_sasl_bind(
rc = ldap_int_client_controls( ld, cctrls );	rc = ldap_int_client_controls( ld, cctrls );
if( rc != LDAP_SUCCESS ) return rc;	if( rc != LDAP_SUCCESS ) return rc;

if( msgidp == NULL ) {
ld->ld_errno = LDAP_PARAM_ERROR;
return ld->ld_errno;
}

if( mechanism == LDAP_SASL_SIMPLE ) {	if( mechanism == LDAP_SASL_SIMPLE ) {
if( dn == NULL && cred != NULL ) {	if( dn == NULL && cred != NULL && cred->bv_len ) {
/* use default binddn */	/* use default binddn */
dn = ld->ld_defbinddn;	dn = ld->ld_defbinddn;
}	}
Line 106 ldap_sasl_bind(	Line 105 ldap_sasl_bind(
ld->ld_version, dn, LDAP_AUTH_SIMPLE,	ld->ld_version, dn, LDAP_AUTH_SIMPLE,
cred );	cred );

} else if ( cred == NULL \|\| !cred->bv_len ) {	} else if ( cred == NULL \|\| cred->bv_val == NULL ) {
/* SASL bind w/o creditials */	/* SASL bind w/o creditials */
rc = ber_printf( ber, "{it{ist{sN}N}" /}/,	rc = ber_printf( ber, "{it{ist{sN}N}" /}/,
++ld->ld_msgid, LDAP_REQ_BIND,	++ld->ld_msgid, LDAP_REQ_BIND,
Line 139 ldap_sasl_bind(	Line 138 ldap_sasl_bind(
return ld->ld_errno;	return ld->ld_errno;
}	}

#ifndef LDAP_NOCACHE
if ( ld->ld_cache != NULL ) {
ldap_flush_cache( ld );
}
#endif /* !LDAP_NOCACHE */

/* send the message */	/* send the message */
*msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber );	*msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber );
Line 169 ldap_sasl_bind_s(	Line 163 ldap_sasl_bind_s(
LDAPMessage *result;	LDAPMessage *result;
struct berval *scredp = NULL;	struct berval *scredp = NULL;

	#ifdef NEW_LOGGING
	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind_s\n", 0, 0, 0 );
	#else
Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 );	Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 );
	#endif

/* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */	/* do a quick !LDAPv3 check... ldap_sasl_bind will do the rest. */
if( servercredp != NULL ) {	if( servercredp != NULL ) {
Line 251 ldap_parse_sasl_bind_result(	Line 249 ldap_parse_sasl_bind_result(
ber_tag_t tag;	ber_tag_t tag;
BerElement *ber;	BerElement *ber;

	#ifdef NEW_LOGGING
	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
	#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );	Debug( LDAP_DEBUG_TRACE, "ldap_parse_sasl_bind_result\n", 0, 0, 0 );
	#endif

assert( ld != NULL );	assert( ld != NULL );
assert( LDAP_VALID( ld ) );	assert( LDAP_VALID( ld ) );
assert( res != NULL );	assert( res != NULL );

if ( ld == NULL \|\| res == NULL ) {
return LDAP_PARAM_ERROR;
}

if( servercredp != NULL ) {	if( servercredp != NULL ) {
if( ld->ld_version < LDAP_VERSION2 ) {	if( ld->ld_version < LDAP_VERSION2 ) {
return LDAP_NOT_SUPPORTED;	return LDAP_NOT_SUPPORTED;
Line 364 ldap_pvt_sasl_getmechs ( LDAP *ld, char	Line 362 ldap_pvt_sasl_getmechs ( LDAP *ld, char
char *values, mechlist;	char *values, mechlist;
int rc;	int rc;

	#ifdef NEW_LOGGING
	LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
	#else
Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );	Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 );
	#endif

rc = ldap_search_s( ld, "", LDAP_SCOPE_BASE,	rc = ldap_search_s( ld, "", LDAP_SCOPE_BASE,
NULL, attrs, 0, &res );	NULL, attrs, 0, &res );
Line 425 ldap_sasl_interactive_bind_s(	Line 427 ldap_sasl_interactive_bind_s(
void *defaults )	void *defaults )
{	{
int rc;	int rc;
	char *smechs = NULL;

#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 );
Line 439 ldap_sasl_interactive_bind_s(	Line 442 ldap_sasl_interactive_bind_s(
return rc < 0 ? rc : 0;	return rc < 0 ? rc : 0;
} else	} else
#endif	#endif

	#ifdef HAVE_CYRUS_SASL
if( mechs == NULL \|\| *mechs == '\0' ) {	if( mechs == NULL \|\| *mechs == '\0' ) {
char *smechs;	mechs = ld->ld_options.ldo_def_sasl_mech;
	}
	#endif

	if( mechs == NULL \|\| *mechs == '\0' ) {
rc = ldap_pvt_sasl_getmechs( ld, &smechs );	rc = ldap_pvt_sasl_getmechs( ld, &smechs );

if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
goto done;	goto done;
}	}

	#ifdef NEW_LOGGING
	LDAP_LOG ( TRANSPORT, DETAIL1,
	"ldap_interactive_sasl_bind_s: server supports: %s\n",
	smechs, 0, 0 );
	#else
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"ldap_interactive_sasl_bind_s: server supports: %s\n",	"ldap_interactive_sasl_bind_s: server supports: %s\n",
smechs, 0, 0 );	smechs, 0, 0 );
	#endif

mechs = smechs;	mechs = smechs;

} else {	} else {
	#ifdef NEW_LOGGING
	LDAP_LOG ( TRANSPORT, DETAIL1,
	"ldap_interactive_sasl_bind_s: user selected: %s\n", mechs, 0, 0 );
	#else
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"ldap_interactive_sasl_bind_s: user selected: %s\n",	"ldap_interactive_sasl_bind_s: user selected: %s\n",
mechs, 0, 0 );	mechs, 0, 0 );
	#endif
}	}

rc = ldap_int_sasl_bind( ld, dn, mechs,	rc = ldap_int_sasl_bind( ld, dn, mechs,
Line 468 done:	Line 487 done:
#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )	#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )
ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );	ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );
#endif	#endif
	if ( smechs ) LDAP_FREE( smechs );

return rc;	return rc;
}	}

Removed from v.1.41
changed lines
	Added in v.1.41.2.8