mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix referral return in back-ldbm as well (same as ITS#3475)

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-01-12 21:01:42 +00:00
parent 3bbfa91177
commit 9885b55e9d
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
servers/slapd/back-ldbm/referral.c
View File

@ -30,7 +30,8 @@ ldbm_back_referrals(
SlapReply *rs )
{
struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
Entry *e, *matched;
Entry *e, *matched;
int rc = LDAP_SUCCESS;
if( op->o_tag == LDAP_REQ_SEARCH ) {
/* let search take care of itself */
@ -55,36 +56,37 @@ ldbm_back_referrals(
"ldbm_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
op->o_tag, op->o_req_dn.bv_val, rs->sr_matched );
if( is_entry_referral( matched ) ) {
rs->sr_err = LDAP_OTHER;
if ( is_entry_referral( matched ) ) {
rc = rs->sr_err = LDAP_OTHER;
rs->sr_ref = get_entry_referrals( op, matched );
}
cache_return_entry_r( &li->li_cache, matched );
} else if ( default_referral != NULL ) {
rs->sr_err = LDAP_OTHER;
rs->sr_ref = referral_rewrite( default_referral,
NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
}
ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
if( rs->sr_ref != NULL ) {
if ( rs->sr_ref != NULL ) {
/* send referrals */
rs->sr_err = LDAP_REFERRAL;
send_ldap_result( op, rs );
ber_bvarray_free( rs->sr_ref );
rc = rs->sr_err = LDAP_REFERRAL;
} else if ( rs->sr_err != LDAP_SUCCESS ) {
} else {
rs->sr_text = rs->sr_matched ? "bad referral object" : "bad default referral";
send_ldap_result( op, rs );
}
send_ldap_result( op, rs );
if ( rs->sr_matched ) free( (char *)rs->sr_matched );
if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
rs->sr_text = NULL;
rs->sr_ref = NULL;
rs->sr_matched = NULL;
return rs->sr_err;
return rc;
}
if ( is_entry_referral( e ) ) {
@ -99,23 +101,24 @@ ldbm_back_referrals(
rs->sr_matched = e->e_name.bv_val;
if( rs->sr_ref != NULL ) {
rs->sr_err = LDAP_REFERRAL;
send_ldap_result( op, rs );
ber_bvarray_free( rs->sr_ref );
rc = rs->sr_err = LDAP_REFERRAL;
rs->sr_text = NULL;
} else {
send_ldap_error( op, rs, LDAP_OTHER,
"bad referral object" );
rc = rs->sr_err = LDAP_OTHER;
rs->sr_text = "bad referral object";
}
send_ldap_result( op, rs );
if( refs != NULL ) ber_bvarray_free( refs );
if ( refs != NULL ) ber_bvarray_free( refs );
rs->sr_err = rc;
rs->sr_ref = NULL;
rs->sr_text = NULL;
rs->sr_matched = NULL;
}
cache_return_entry_r( &li->li_cache, e );
ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
return rs->sr_err;
return rc;
}