--- libraries/libldap/sasl.c 2004/01/21 08:03:23 1.41.2.8 +++ libraries/libldap/sasl.c 2002/04/01 20:28:02 1.42 @@ -1,6 +1,6 @@ -/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.41.2.7 2003/05/22 22:22:41 kurt Exp $ */ +/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.41 2002/01/04 20:17:39 kurt Exp $ */ /* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -62,7 +62,7 @@ ldap_sasl_bind( int rc; #ifdef NEW_LOGGING - LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind\n", 0, 0, 0 ); + LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind\n" )); #else Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind\n", 0, 0, 0 ); #endif @@ -75,8 +75,13 @@ ldap_sasl_bind( rc = ldap_int_client_controls( ld, cctrls ); 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( dn == NULL && cred != NULL && cred->bv_len ) { + if( dn == NULL && cred != NULL ) { /* use default binddn */ dn = ld->ld_defbinddn; } @@ -105,7 +110,7 @@ ldap_sasl_bind( ld->ld_version, dn, LDAP_AUTH_SIMPLE, cred ); - } else if ( cred == NULL || cred->bv_val == NULL ) { + } else if ( cred == NULL || !cred->bv_len ) { /* SASL bind w/o creditials */ rc = ber_printf( ber, "{it{ist{sN}N}" /*}*/, ++ld->ld_msgid, LDAP_REQ_BIND, @@ -138,6 +143,11 @@ ldap_sasl_bind( return ld->ld_errno; } +#ifndef LDAP_NOCACHE + if ( ld->ld_cache != NULL ) { + ldap_flush_cache( ld ); + } +#endif /* !LDAP_NOCACHE */ /* send the message */ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber ); @@ -164,7 +174,7 @@ ldap_sasl_bind_s( struct berval *scredp = NULL; #ifdef NEW_LOGGING - LDAP_LOG ( TRANSPORT, ENTRY, "ldap_sasl_bind_s\n", 0, 0, 0 ); + LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_sasl_bind_s\n" )); #else Debug( LDAP_DEBUG_TRACE, "ldap_sasl_bind_s\n", 0, 0, 0 ); #endif @@ -250,7 +260,7 @@ ldap_parse_sasl_bind_result( BerElement *ber; #ifdef NEW_LOGGING - LDAP_LOG ( TRANSPORT, ENTRY, "ldap_parse_sasl_bind_result\n", 0, 0, 0 ); + 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 ); #endif @@ -259,6 +269,10 @@ ldap_parse_sasl_bind_result( assert( LDAP_VALID( ld ) ); assert( res != NULL ); + if ( ld == NULL || res == NULL ) { + return LDAP_PARAM_ERROR; + } + if( servercredp != NULL ) { if( ld->ld_version < LDAP_VERSION2 ) { return LDAP_NOT_SUPPORTED; @@ -363,7 +377,7 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char int rc; #ifdef NEW_LOGGING - LDAP_LOG ( TRANSPORT, ENTRY, "ldap_pvt_sasl_getmech\n", 0, 0, 0 ); + LDAP_LOG (( "sasl", LDAP_LEVEL_ENTRY, "ldap_pvt_sasl_getmech\n" )); #else Debug( LDAP_DEBUG_TRACE, "ldap_pvt_sasl_getmech\n", 0, 0, 0 ); #endif @@ -427,7 +441,6 @@ ldap_sasl_interactive_bind_s( void *defaults ) { int rc; - char *smechs = NULL; #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL ) ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex ); @@ -442,14 +455,9 @@ ldap_sasl_interactive_bind_s( return rc < 0 ? rc : 0; } else #endif - -#ifdef HAVE_CYRUS_SASL if( mechs == NULL || *mechs == '\0' ) { - mechs = ld->ld_options.ldo_def_sasl_mech; - } -#endif + char *smechs; - if( mechs == NULL || *mechs == '\0' ) { rc = ldap_pvt_sasl_getmechs( ld, &smechs ); if( rc != LDAP_SUCCESS ) { @@ -457,9 +465,8 @@ ldap_sasl_interactive_bind_s( } #ifdef NEW_LOGGING - LDAP_LOG ( TRANSPORT, DETAIL1, - "ldap_interactive_sasl_bind_s: server supports: %s\n", - smechs, 0, 0 ); + LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1, + "ldap_interactive_sasl_bind_s: server supports: %s\n", smechs )); #else Debug( LDAP_DEBUG_TRACE, "ldap_interactive_sasl_bind_s: server supports: %s\n", @@ -470,8 +477,8 @@ ldap_sasl_interactive_bind_s( } else { #ifdef NEW_LOGGING - LDAP_LOG ( TRANSPORT, DETAIL1, - "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs, 0, 0 ); + LDAP_LOG (( "sasl", LDAP_LEVEL_DETAIL1, + "ldap_interactive_sasl_bind_s: user selected: %s\n", mechs )); #else Debug( LDAP_DEBUG_TRACE, "ldap_interactive_sasl_bind_s: user selected: %s\n", @@ -487,7 +494,6 @@ done: #if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL ) ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex ); #endif - if ( smechs ) LDAP_FREE( smechs ); return rc; }