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.146 and 1.147

version 1.146, 2007/01/04 14:01:22	version 1.147, 2007/01/04 17:33:45
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.145 2007/01/02 19:00:58 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.146 2007/01/04 14:01:22 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-2007 The OpenLDAP Foundation.	* Copyright 1998-2007 The OpenLDAP Foundation.
Line 903 nextresp2:	Line 903 nextresp2:
}	}

/* try to handle unsolicited responses as appropriate */	/* try to handle unsolicited responses as appropriate */
if ( id == 0 && msgid != LDAP_RES_UNSOLICITED ) {	if ( id == 0 && msgid > LDAP_RES_UNSOLICITED ) {
int is_nod = 0;	int is_nod = 0;

tag = ber_peek_tag( ber, &len );	tag = ber_peek_tag( ber, &len );

/* we have a res oid */	/* we have a res oid */
if ( tag == LDAP_TAG_EXOP_RES_OID ) {	if ( tag == LDAP_TAG_EXOP_RES_OID ) {
char *resoid = NULL;	static struct berval bv_nod = BER_BVC( LDAP_NOTICE_OF_DISCONNECTION );
	struct berval resoid = BER_BVNULL;

if ( ber_scanf( ber, "a", &resoid ) == LBER_ERROR ) {	if ( ber_scanf( ber, "m", &resoid ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;	ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( ber, 1 );	ber_free( ber, 1 );
return -1;	return -1;
}	}

assert( resoid[ 0 ] != '\0' );	assert( !BER_BVISEMPTY( &resoid ) );

is_nod = strcmp( resoid, LDAP_NOTICE_OF_DISCONNECTION ) == 0;	is_nod = ber_bvcmp( &resoid, &bv_nod ) == 0;
LDAP_FREE( resoid );

tag = ber_peek_tag( ber, &len );	tag = ber_peek_tag( ber, &len );
}	}

/* we have a res value */	#if 0 /* don't need right now */
	/* we have res data */
if ( tag == LDAP_TAG_EXOP_RES_VALUE ) {	if ( tag == LDAP_TAG_EXOP_RES_VALUE ) {
/* don't need right now */	struct berval resdata;

	if ( ber_scanf( ber, "m", &resdata ) == LBER_ERROR ) {
	ld->ld_errno = LDAP_DECODING_ERROR;
	ber_free( ber, 0 );
	return ld->ld_errno;
	}

	/* use it... */
}	}
	#endif

/* handle RFC 4511 "Notice of Disconnection" locally */	/* handle RFC 4511 "Notice of Disconnection" locally */

Removed from v.1.146
changed lines
	Added in v.1.147