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.42 and 1.43

version 1.42, 2000/05/25 23:11:18	version 1.43, 2000/05/31 15:34:44
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.41 2000/05/13 00:38:39 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.42 2000/05/25 23:11:18 kurt Exp $ */
/*	/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 6	Line 6
/* Portions	/* Portions
* Copyright (c) 1990 Regents of the University of Michigan.	* Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.	* All rights reserved.
	******************************************************************************
	* This notice applies to changes, created by or for Novell, Inc.,
	* to preexisting works for which notices appear elsewhere in this file.
	*
	* Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
	*
	* THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND TREATIES.
	* USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT TO VERSION
	* 2.0.1 OF THE OPENLDAP PUBLIC LICENSE, A COPY OF WHICH IS AVAILABLE AT
	* HTTP://WWW.OPENLDAP.ORG/LICENSE.HTML OR IN THE FILE "LICENSE" IN THE
	* TOP-LEVEL DIRECTORY OF THE DISTRIBUTION. ANY USE OR EXPLOITATION OF THIS
	* WORK OTHER THAN AS AUTHORIZED IN VERSION 2.0.1 OF THE OPENLDAP PUBLIC
	* LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT THE
	* PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
	******************************************************************************
	* Modification to OpenLDAP source by Novell, Inc.
	* April 2000 sfs Add code to process V3 referrals and search results
*	*
* result.c - wait for an ldap result	* result.c - wait for an ldap result
*/	*/
Line 279 try_read1msg(	Line 296 try_read1msg(
ber_tag_t tag;	ber_tag_t tag;
ber_len_t len;	ber_len_t len;
int foundit = 0;	int foundit = 0;
LDAPRequest *lr;	LDAPRequest lr, tmplr;
BerElement tmpber;	BerElement tmpber;
int rc, refer_cnt, hadref, simple_request;	int rc, refer_cnt, hadref, simple_request;
ber_int_t lderr;	ber_int_t lderr;
	/*
	* v3ref = flag for V3 referral / search reference
	* 0 = not a ref, 1 = sucessfully chased ref, -1 = pass ref to application
	*/
	int v3ref;

assert( ld != NULL );	assert( ld != NULL );
assert( lc != NULL );	assert( lc != NULL );
Line 338 try_read1msg(	Line 360 try_read1msg(
/* if it's been abandoned, toss it */	/* if it's been abandoned, toss it */
if ( ldap_abandoned( ld, id ) ) {	if ( ldap_abandoned( ld, id ) ) {
ber_free( ber, 1 );	ber_free( ber, 1 );
	Debug( LDAP_DEBUG_ANY, "abandoned\n", 0, 0, 0);
return( -2 ); /* continue looking */	return( -2 ); /* continue looking */
}	}

Line 356 try_read1msg(	Line 379 try_read1msg(
return( -1 );	return( -1 );
}	}

Debug( LDAP_DEBUG_TRACE, "ldap_read: %s msgid %ld, original id %ld\n",	Debug( LDAP_DEBUG_TRACE, "ldap_read: message type %s msgid %ld, original id %ld\n",
( tag == LDAP_RES_SEARCH_ENTRY ) ? "entry" :	( tag == LDAP_RES_SEARCH_ENTRY ) ? "entry" :
( tag == LDAP_RES_SEARCH_REFERENCE ) ? "reference" : "result",	( tag == LDAP_RES_SEARCH_REFERENCE ) ? "reference" : "result",
(long) id, (long) lr->lr_origid );	(long) lr->lr_msgid, (long) lr->lr_origid );

id = lr->lr_origid;	id = lr->lr_origid;
refer_cnt = 0;	refer_cnt = 0;
Line 367 try_read1msg(	Line 390 try_read1msg(
rc = -2; /* default is to keep looking (no response found) */	rc = -2; /* default is to keep looking (no response found) */
lr->lr_res_msgtype = tag;	lr->lr_res_msgtype = tag;

if ( tag != LDAP_RES_SEARCH_ENTRY ) {	/*
	* This code figures out if we are going to chase a
	* referral / search reference, or pass it back to the application
	*/
	v3ref = 0; /* Assume not a V3 search reference or referral */
	if( (tag != LDAP_RES_SEARCH_ENTRY) && (ld->ld_version > LDAP_VERSION2) ) {
	BerElement tmpber = ber; / struct copy */
	char **refs = NULL;

	if( tag == LDAP_RES_SEARCH_REFERENCE) {
	/* This is a V3 search reference */
	/* Assume we do not chase the reference, but pass it to application */
	v3ref = -1;
	if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS) \|\|
	(lr->lr_parent != NULL) )
	{
	/* Get the referral list */
	if ( ber_scanf( &tmpber, "{v}", &refs ) == LBER_ERROR ) {
	rc = LDAP_DECODING_ERROR;
	} else {
	/* Note: refs arrary is freed by ldap_chase_v3referrals */
	refer_cnt = ldap_chase_v3referrals( ld, lr, refs,
	&lr->lr_res_error, &hadref );
	if ( refer_cnt > 0 ) { /* sucessfully chased reference */
	/* If haven't got end search, set chasing referrals */
	if( lr->lr_status != LDAP_REQST_COMPLETED) {
	lr->lr_status = LDAP_REQST_CHASINGREFS;
	Debug( LDAP_DEBUG_TRACE,
	"read1msg: search ref chased, mark request chasing refs, id = %d\n",
	lr->lr_msgid, 0, 0);
	}
	v3ref = 1; /* We sucessfully chased the reference */
	}
	}
	}
	} else {
	/* Check for V3 referral */
	ber_len_t len;
	if ( ber_scanf( &tmpber, "{iaa",/}/ &lderr,
	&lr->lr_res_matched, &lr->lr_res_error )
	!= LBER_ERROR ) {
	/* Check if V3 referral */
	if( ber_peek_tag( &tmpber, &len) == LDAP_TAG_REFERRAL ) {
	/* We have a V3 referral, assume we cannot chase it */
	v3ref = -1;
	if( LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_REFERRALS)
	\|\| (lr->lr_parent != NULL) )
	{
	v3ref = -1; /* Assume referral not chased and return it to app */
	/* Get the referral list */
	if( ber_scanf( &tmpber, "v", &refs) == LBER_ERROR) {
	rc = LDAP_DECODING_ERROR;
	lr->lr_status = LDAP_REQST_COMPLETED;
	Debug( LDAP_DEBUG_TRACE,
	"read1msg: referral decode error, mark request completed, id = %d\n",
	lr->lr_msgid, 0, 0);
	} else {
	/* Chase the referral
	* Note: refs arrary is freed by ldap_chase_v3referrals
	*/
	refer_cnt = ldap_chase_v3referrals( ld, lr, refs,
	&lr->lr_res_error, &hadref );
	lr->lr_status = LDAP_REQST_COMPLETED;
	Debug( LDAP_DEBUG_TRACE,
	"read1msg: referral chased, mark request completed, id = %d\n",
	lr->lr_msgid, 0, 0);
	if( refer_cnt > 0) {
	v3ref = 1; /* Referral successfully chased */
	}
	}
	}
	}
	}
	}
	}

	/* All results that just return a status, i.e. don't return data
	* go through the following code. This code also chases V2 referrals
	* and checks if all referrals have been chased.
	*/
	if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref > -1) ) {
	/* 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 &&
( 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) ) )
{	{
tmpber = ber; / struct copy */	tmpber = ber; / struct copy */
	if ( v3ref == 1 ) {
	; /* V3 search reference or V3 referral sucessfully chased */
	} else
if ( ber_scanf( &tmpber, "{iaa}", &lderr,	if ( ber_scanf( &tmpber, "{iaa}", &lderr,
&lr->lr_res_matched, &lr->lr_res_error )	&lr->lr_res_matched, &lr->lr_res_error )
!= LBER_ERROR ) {	!= LBER_ERROR ) {
Line 380 try_read1msg(	Line 487 try_read1msg(
/* referrals are in error string */	/* referrals are in error string */
refer_cnt = ldap_chase_referrals( ld, lr,	refer_cnt = ldap_chase_referrals( ld, lr,
&lr->lr_res_error, &hadref );	&lr->lr_res_error, &hadref );
	lr->lr_status = LDAP_REQST_COMPLETED;
	Debug( LDAP_DEBUG_TRACE,
	"read1msg: V2 referral chased, mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
}	}

/* save errno, message, and matched string */	/* save errno, message, and matched string */
Line 408 Debug( LDAP_DEBUG_TRACE,	Line 518 Debug( LDAP_DEBUG_TRACE,
if ( refer_cnt < 0 ) {	if ( refer_cnt < 0 ) {
return( -1 ); /* fatal error */	return( -1 ); /* fatal error */
}	}
lr->lr_status = LDAP_REQST_CHASINGREFS;	lr->lr_res_errno = LDAP_SUCCESS; /* sucessfully chased referral */
} else {	} else {
if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) {	if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) {
/* request without any referrals */	/* request without any referrals */
Line 419 Debug( LDAP_DEBUG_TRACE,	Line 529 Debug( LDAP_DEBUG_TRACE,
ber = NULL;	ber = NULL;
}	}

	lr->lr_status = LDAP_REQST_COMPLETED; /* declare this request done */
	Debug( LDAP_DEBUG_TRACE,
	"read1msg: mark request completed, id = %d\n", lr->lr_msgid, 0, 0);
while ( lr->lr_parent != NULL ) {	while ( lr->lr_parent != NULL ) {
merge_error_info( ld, lr->lr_parent, lr );	merge_error_info( ld, lr->lr_parent, lr );

Line 428 Debug( LDAP_DEBUG_TRACE,	Line 541 Debug( LDAP_DEBUG_TRACE,
}	}
}	}

if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) {	/* Check if all requests are finished, lr is now parent */
	for(tmplr=lr ; tmplr != NULL; tmplr=tmplr->lr_refnext) {
	if( tmplr->lr_status != LDAP_REQST_COMPLETED) {
	break;
	}
	}

	/* This is the parent request if the request has referrals */
	if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL && tmplr == NULL ) {
id = lr->lr_msgid;	id = lr->lr_msgid;
tag = lr->lr_res_msgtype;	tag = lr->lr_res_msgtype;
Debug( LDAP_DEBUG_ANY, "request %ld done\n",	Debug( LDAP_DEBUG_ANY, "request %ld done\n",
Line 479 lr->lr_res_matched ? lr->lr_res_matched	Line 600 lr->lr_res_matched ? lr->lr_res_matched
if ( msgid == LDAP_RES_ANY \|\| id == msgid ) {	if ( msgid == LDAP_RES_ANY \|\| id == msgid ) {
if ( all == LDAP_MSG_ONE	if ( all == LDAP_MSG_ONE
\|\| (new->lm_msgtype != LDAP_RES_SEARCH_RESULT	\|\| (new->lm_msgtype != LDAP_RES_SEARCH_RESULT
&& new->lm_msgtype != LDAP_RES_SEARCH_ENTRY) ) {	&& new->lm_msgtype != LDAP_RES_SEARCH_ENTRY
	&& new->lm_msgtype != LDAP_RES_SEARCH_REFERENCE) ) {
*result = new;	*result = new;
ld->ld_errno = LDAP_SUCCESS;	ld->ld_errno = LDAP_SUCCESS;
return( tag );	return( tag );
Line 518 lr->lr_res_matched ? lr->lr_res_matched	Line 640 lr->lr_res_matched ? lr->lr_res_matched
(long) new->lm_msgid, (long) new->lm_msgtype, 0 );	(long) new->lm_msgid, (long) new->lm_msgtype, 0 );

/* part of a search response - add to end of list of entries */	/* part of a search response - add to end of list of entries */
for ( tmp = l; tmp->lm_chain != NULL &&	for ( tmp = l; (tmp->lm_chain != NULL) &&
tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY;	((tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY) \|\|
	(tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE));
tmp = tmp->lm_chain )	tmp = tmp->lm_chain )
; /* NULL */	; /* NULL */
tmp->lm_chain = new;	tmp->lm_chain = new;

Removed from v.1.42
changed lines
	Added in v.1.43