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.55 and 1.58.2.3

version 1.55, 2003/11/26 06:16:38	version 1.58.2.3, 2005/11/14 18:06:06
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.54 2003/09/24 23:00:34 jongchoi Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.58.2.2 2005/08/10 21:57:17 kurt Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2003 The OpenLDAP Foundation.	* Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 74 ldap_sasl_bind(	Line 74 ldap_sasl_bind(
int rc;	int rc;
ber_int_t id;	ber_int_t id;

#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 120 ldap_sasl_bind(	Line 116 ldap_sasl_bind(
cred );	cred );

} else if ( cred == NULL \|\| cred->bv_val == NULL ) {	} else if ( cred == NULL \|\| cred->bv_val == NULL ) {
/* SASL bind w/o creditials */	/* SASL bind w/o credentials */
rc = ber_printf( ber, "{it{ist{sN}N}" /}/,	rc = ber_printf( ber, "{it{ist{sN}N}" /}/,
id, LDAP_REQ_BIND,	id, LDAP_REQ_BIND,
ld->ld_version, dn, LDAP_AUTH_SASL,	ld->ld_version, dn, LDAP_AUTH_SASL,
mechanism );	mechanism );

} else {	} else {
/* SASL bind w/ creditials */	/* SASL bind w/ credentials */
rc = ber_printf( ber, "{it{ist{sON}N}" /}/,	rc = ber_printf( ber, "{it{ist{sON}N}" /}/,
id, LDAP_REQ_BIND,	id, LDAP_REQ_BIND,
ld->ld_version, dn, LDAP_AUTH_SASL,	ld->ld_version, dn, LDAP_AUTH_SASL,
Line 177 ldap_sasl_bind_s(	Line 173 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 263 ldap_parse_sasl_bind_result(	Line 255 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 ) );
Line 306 ldap_parse_sasl_bind_result(	Line 294 ldap_parse_sasl_bind_result(
}	}

if ( ld->ld_version < LDAP_VERSION2 ) {	if ( ld->ld_version < LDAP_VERSION2 ) {
	#ifdef LDAP_NULL_IS_NULL
	tag = ber_scanf( ber, "{iA}",
	&errcode, &ld->ld_error );
	#else /* ! LDAP_NULL_IS_NULL */
tag = ber_scanf( ber, "{ia}",	tag = ber_scanf( ber, "{ia}",
&errcode, &ld->ld_error );	&errcode, &ld->ld_error );
	#endif /* ! LDAP_NULL_IS_NULL */

if( tag == LBER_ERROR ) {	if( tag == LBER_ERROR ) {
ber_free( ber, 0 );	ber_free( ber, 0 );
Line 318 ldap_parse_sasl_bind_result(	Line 311 ldap_parse_sasl_bind_result(
} else {	} else {
ber_len_t len;	ber_len_t len;

tag = ber_scanf( ber, "{iaa" /}/,	#ifdef LDAP_NULL_IS_NULL
	tag = ber_scanf( ber, "{eAA" /}/,
	&errcode, &ld->ld_matched, &ld->ld_error );
	#else /* ! LDAP_NULL_IS_NULL */
	tag = ber_scanf( ber, "{eaa" /}/,
&errcode, &ld->ld_matched, &ld->ld_error );	&errcode, &ld->ld_matched, &ld->ld_error );
	#endif /* ! LDAP_NULL_IS_NULL */

if( tag == LBER_ERROR ) {	if( tag == LBER_ERROR ) {
ber_free( ber, 0 );	ber_free( ber, 0 );
Line 376 ldap_pvt_sasl_getmechs ( LDAP *ld, char	Line 374 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 470 ldap_sasl_interactive_bind_s(	Line 464 ldap_sasl_interactive_bind_s(
goto done;	goto done;
}	}

#ifdef NEW_LOGGING
LDAP_LOG ( TRANSPORT, DETAIL1,
"ldap_sasl_interactive_bind_s: server supports: %s\n",
smechs, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"ldap_sasl_interactive_bind_s: server supports: %s\n",	"ldap_sasl_interactive_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_sasl_interactive_bind_s: user selected: %s\n",
mechs, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"ldap_sasl_interactive_bind_s: user selected: %s\n",	"ldap_sasl_interactive_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.55
changed lines
	Added in v.1.58.2.3