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.64.2.8 and 1.81

version 1.64.2.8, 2010/04/13 20:22:59	version 1.81, 2010/10/13 06:43:16
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.64.2.7 2009/10/31 00:11:22 quanah Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.80 2010/09/12 08:09:45 hyc 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-2010 The OpenLDAP Foundation.	* Copyright 1998-2010 The OpenLDAP Foundation.
Line 422 ldap_sasl_interactive_bind_s(	Line 422 ldap_sasl_interactive_bind_s(
int rc;	int rc;
char *smechs = NULL;	char *smechs = NULL;

#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )	#if defined( HAVE_CYRUS_SASL )
ldap_pvt_thread_mutex_lock( &ldap_int_sasl_mutex );	LDAP_MUTEX_LOCK( &ldap_int_sasl_mutex );
#endif	#endif
#ifdef LDAP_CONNECTIONLESS	#ifdef LDAP_CONNECTIONLESS
if( LDAP_IS_UDP(ld) ) {	if( LDAP_IS_UDP(ld) ) {
Line 466 ldap_sasl_interactive_bind_s(	Line 466 ldap_sasl_interactive_bind_s(
flags, interact, defaults );	flags, interact, defaults );

done:	done:
#if defined( LDAP_R_COMPILE ) && defined( HAVE_CYRUS_SASL )	#if defined( HAVE_CYRUS_SASL )
ldap_pvt_thread_mutex_unlock( &ldap_int_sasl_mutex );	LDAP_MUTEX_UNLOCK( &ldap_int_sasl_mutex );
#endif	#endif
if ( smechs ) LDAP_FREE( smechs );	if ( smechs ) LDAP_FREE( smechs );

Line 733 sb_sasl_generic_write( Sockbuf_IO_Desc *	Line 733 sb_sasl_generic_write( Sockbuf_IO_Desc *
return ret;	return ret;
} else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {	} else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
/* partial write? pretend nothing got written */	/* partial write? pretend nothing got written */
len2 = 0;
p->flags \|= LDAP_PVT_SASL_PARTIAL_WRITE;	p->flags \|= LDAP_PVT_SASL_PARTIAL_WRITE;
	sock_errset(EAGAIN);
	len2 = -1;
}	}

/* return number of bytes encoded, not written, to ensure	/* return number of bytes encoded, not written, to ensure

Removed from v.1.64.2.8
changed lines
	Added in v.1.81