upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-21 06:14:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Honour o_no_subordinate_glue

Browse source 
Don't pollute o_req_ndn after resetting (hyc please review)
This commit is contained in:
Luke Howard 2006-06-10 12:31:22 +00:00
parent 7c9c559019
commit a75a4f4eff
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/backglue.c
View file

@ -347,6 +347,8 @@ glue_op_search ( Operation *op, SlapReply *rs )
continue; continue;
if (!dnIsSuffix(&btmp->be_nsuffix[0], &b1->be_nsuffix[0])) if (!dnIsSuffix(&btmp->be_nsuffix[0], &b1->be_nsuffix[0]))
continue; continue;
if (get_no_subordinate_glue(op) && btmp != b1)
continue;
if (tlimit0 != SLAP_NO_LIMIT) { if (tlimit0 != SLAP_NO_LIMIT) {
op->o_time = slap_get_time(); op->o_time = slap_get_time();
@ -382,6 +384,9 @@ glue_op_search ( Operation *op, SlapReply *rs )
} else if (scope0 == LDAP_SCOPE_SUBTREE && } else if (scope0 == LDAP_SCOPE_SUBTREE &&
dn_match(&op->o_bd->be_nsuffix[0], &ndn)) dn_match(&op->o_bd->be_nsuffix[0], &ndn))
{ {
op->ors_scope = LDAP_SCOPE_SUBTREE;
op->o_req_dn = dn;
op->o_req_ndn = ndn;
rs->sr_err = glue_sub_search( op, rs, b0, on ); rs->sr_err = glue_sub_search( op, rs, b0, on );
} else if (scope0 == LDAP_SCOPE_SUBTREE && } else if (scope0 == LDAP_SCOPE_SUBTREE &&
@ -397,6 +402,9 @@ glue_op_search ( Operation *op, SlapReply *rs )
op->o_req_ndn = ndn; op->o_req_ndn = ndn;
} else if (dnIsSuffix(&ndn, &op->o_bd->be_nsuffix[0])) { } else if (dnIsSuffix(&ndn, &op->o_bd->be_nsuffix[0])) {
op->ors_scope = scope0;
op->o_req_dn = dn;
op->o_req_ndn = ndn;
rs->sr_err = glue_sub_search( op, rs, b0, on ); rs->sr_err = glue_sub_search( op, rs, b0, on );
} }