libraries/libldap/result.c - diff

Return to result.c CVS log

Up to [OpenLDAP] / libraries / libldap

Diff for /libraries/libldap/result.c between versions 1.110 and 1.111

version 1.110, 2005/08/03 14:54:08	version 1.111, 2005/08/09 22:54:38
Line 1	Line 1
/* result.c - wait for an ldap result */	/* result.c - wait for an ldap result */
/* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.109 2005/08/01 21:35:44 ando Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.110 2005/08/03 14:54:08 ando 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-2005 The OpenLDAP Foundation.	* Copyright 1998-2005 The OpenLDAP Foundation.
Line 555 nextresp2:	Line 555 nextresp2:
ber_len_t len;	ber_len_t len;
char *lr_res_error = NULL;	char *lr_res_error = NULL;

if ( ber_scanf( &tmpber, "{iaa",/}/ &lderr,	if ( ber_scanf( &tmpber, "{eaa",/}/ &lderr,
&lr->lr_res_matched, &lr_res_error )	&lr->lr_res_matched, &lr_res_error )
!= LBER_ERROR )	!= LBER_ERROR )
{	{
Line 636 nextresp2:	Line 636 nextresp2:
*/	*/
if ( tag == LDAP_RES_SEARCH_RESULT )	if ( tag == LDAP_RES_SEARCH_RESULT )
refer_cnt = 0;	refer_cnt = 0;
} else if ( ber_scanf( &tmpber, "{iaa}", &lderr,	} else if ( ber_scanf( &tmpber, "{eaa}", &lderr,
&lr->lr_res_matched, &lr_res_error )	&lr->lr_res_matched, &lr_res_error )
!= LBER_ERROR )	!= LBER_ERROR )
{	{
Line 978 build_result_ber( LDAP ld, BerElement	Line 978 build_result_ber( LDAP ld, BerElement
return( LBER_ERROR );	return( LBER_ERROR );
}	}

if ( ber_get_int( ber, &along ) == LBER_ERROR ) {	if ( ber_get_enum( ber, &along ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;	ld->ld_errno = LDAP_DECODING_ERROR;
ber_free(ber, 1);	ber_free(ber, 1);
return( LBER_ERROR );	return( LBER_ERROR );

Removed from v.1.110
changed lines
	Added in v.1.111