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.99.2.19 and 1.99.2.20

version 1.99.2.19, 2006/12/13 15:24:09	version 1.99.2.20, 2006/12/14 08:48:16
Line 612 nextresp2:	Line 612 nextresp2:
if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS)	if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS)
\|\| (lr->lr_parent != NULL) )	\|\| (lr->lr_parent != NULL) )
{	{
/* Assume referral not chased and return it to app */
v3ref = V3REF_TOAPP;

/* Get the referral list */	/* Get the referral list */
if( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) {	if( ber_scanf( &tmpber, "{v}", &refs) == LBER_ERROR) {
rc = LDAP_DECODING_ERROR;	rc = LDAP_DECODING_ERROR;
Line 630 nextresp2:	Line 627 nextresp2:
0, &lr->lr_res_error, &hadref );	0, &lr->lr_res_error, &hadref );
lr->lr_status = LDAP_REQST_COMPLETED;	lr->lr_status = LDAP_REQST_COMPLETED;
Debug( LDAP_DEBUG_TRACE,	Debug( LDAP_DEBUG_TRACE,
"read1msg: referral chased, mark request completed, ld %p msgid %d\n",	"read1msg: referral %s chased, "
(void *)ld, lr->lr_msgid, 0);	"mark request completed, ld %p msgid %d\n",
	hadref ? "" : "not",
	(void *)ld, lr->lr_msgid);
if( refer_cnt > 0) {	if( refer_cnt > 0) {
/* Referral successfully chased */	/* Referral successfully chased */
v3ref = V3REF_SUCCESS;	v3ref = V3REF_SUCCESS;
	} else {
	refer_cnt = 0;
}	}
}	}
}	}
Line 648 nextresp2:	Line 649 nextresp2:
LDAP_FREE( lr->lr_res_error );	LDAP_FREE( lr->lr_res_error );
lr->lr_res_error = NULL;	lr->lr_res_error = NULL;
}	}

/* Since it's not a SearchReference, it must be a
* result. Since we're not chasing the referral,
* this request is done.
*/
if ( v3ref == V3REF_TOAPP ) {
lr->lr_status = LDAP_REQST_COMPLETED;
Debug( LDAP_DEBUG_TRACE,
"request done: ld %p msgid %d, "
"referral returned to app\n",
(void *)ld, lr->lr_msgid, 0);
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_lock( &ld->ld_req_mutex );
#endif
ldap_free_request( ld, lr );
#ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_unlock( &ld->ld_req_mutex );
#endif
lr = NULL;
}
}	}
}	}
}	}
Line 676 nextresp2:	Line 657 nextresp2:
* go through the following code. This code also chases V2 referrals	* go through the following code. This code also chases V2 referrals
* and checks if all referrals have been chased.	* and checks if all referrals have been chased.
*/	*/
if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref != V3REF_TOAPP) &&	if ( tag != LDAP_RES_SEARCH_ENTRY &&
(tag != LDAP_RES_INTERMEDIATE ))	tag != LDAP_RES_SEARCH_REFERENCE &&
	tag != LDAP_RES_INTERMEDIATE )
{	{
/* For a v3 search referral/reference, only come here if already chased it */	/* For a v3 search referral/reference, only come here if already chased it */
if ( ld->ld_version >= LDAP_VERSION2 &&	if ( ld->ld_version >= LDAP_VERSION2 &&
	v3ref != V3REF_TOAPP &&
( lr->lr_parent != NULL \|\|	( lr->lr_parent != NULL \|\|
LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ) )	LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) ) )
{	{

Removed from v.1.99.2.19
changed lines
	Added in v.1.99.2.20