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.36 and 1.43

version 1.36, 2001/07/06 01:13:43	version 1.43, 2002/06/05 13:46:27
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.35 2001/06/14 22:14:56 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.42 2002/04/01 20:28:02 julius Exp $ */
/*	/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/	*/

Line 27	Line 27

#include "portable.h"	#include "portable.h"

#include <stdlib.h>
#include <stdio.h>	#include <stdio.h>

#include <ac/socket.h>	#include <ac/socket.h>
	#include <ac/stdlib.h>
#include <ac/string.h>	#include <ac/string.h>
#include <ac/time.h>	#include <ac/time.h>
#include <ac/errno.h>	#include <ac/errno.h>
Line 61 ldap_sasl_bind(	Line 61 ldap_sasl_bind(
BerElement *ber;	BerElement *ber;
int rc;	int rc;

	#ifdef NEW_LOGGING
	LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind\n" ));
	#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 ) {
/* use default binddn */	/* use default binddn */
Line 97 ldap_sasl_bind(	Line 96 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 169 ldap_sasl_bind_s(	Line 168 ldap_sasl_bind_s(
LDAPMessage *result;	LDAPMessage *result;
struct berval *scredp = NULL;	struct berval *scredp = NULL;

	#ifdef NEW_LOGGING
	LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind_s\n" ));
	#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 186 ldap_sasl_bind_s(	Line 189 ldap_sasl_bind_s(
return( rc );	return( rc );
}	}

	#ifdef LDAP_CONNECTIONLESS
	if (LDAP_IS_UDP(ld)) {
	return( rc );
	}
	#endif

if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) {	if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) {
return( ld->ld_errno ); /* ldap_result sets ld_errno */	return( ld->ld_errno ); /* ldap_result sets ld_errno */
}	}
Line 245 ldap_parse_sasl_bind_result(	Line 254 ldap_parse_sasl_bind_result(
ber_tag_t tag;	ber_tag_t tag;
BerElement *ber;	BerElement *ber;

	#ifdef NEW_LOGGING
	LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_parse_sasl_bind_result\n" ));
	#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 358 ldap_pvt_sasl_getmechs ( LDAP *ld, char	Line 367 ldap_pvt_sasl_getmechs ( LDAP *ld, char
char *values, mechlist;	char *values, mechlist;
int rc;	int rc;

	#ifdef NEW_LOGGING
	LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_getmech\n" ));
	#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 423 ldap_sasl_interactive_bind_s(	Line 436 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;

Line 433 ldap_sasl_interactive_bind_s(	Line 455 ldap_sasl_interactive_bind_s(
goto done;	goto done;
}	}

	#ifdef NEW_LOGGING
	LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1,
	"ldap_interactive_sasl_bind_s: server supports: %s\n", smechs ));
	#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 (( "sasl", LDAP_LEVEL_DETAIL1,
	"ldap_interactive_sasl_bind_s: user selected: %s\n", mechs ));
	#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,

Removed from v.1.36
changed lines
	Added in v.1.43