mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#4889 fix search. remainder of code needs similar work.

Browse Source
This commit is contained in:
Howard Chu 2007-11-13 01:22:45 +00:00
parent 82d4844b81
commit 0e3db5ac3e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/overlays/translucent.c
View File

@ -560,10 +560,10 @@ static int translucent_compare(Operation *op, SlapReply *rs) {
*/ */
static int translucent_search_cb(Operation *op, SlapReply *rs) { static int translucent_search_cb(Operation *op, SlapReply *rs) {
BackendDB *db;
slap_overinst *on; slap_overinst *on;
Entry *e, *re = NULL; Entry *e, *re = NULL;
Attribute *a, *ax, *an, *as = NULL; Attribute *a, *ax, *an, *as = NULL;
Operation * original_op, local_op;
int rc; int rc;
if(!op || !rs || rs->sr_type != REP_SEARCH || !rs->sr_entry) if(!op || !rs || rs->sr_type != REP_SEARCH || !rs->sr_entry)
@ -572,13 +572,11 @@ static int translucent_search_cb(Operation *op, SlapReply *rs) {
Debug(LDAP_DEBUG_TRACE, "==> translucent_search_cb: %s\n", Debug(LDAP_DEBUG_TRACE, "==> translucent_search_cb: %s\n",
rs->sr_entry->e_name.bv_val, 0, 0); rs->sr_entry->e_name.bv_val, 0, 0);
original_op = op->o_callback->sc_private; db = op->o_bd;
on = (slap_overinst *) original_op->o_bd->bd_info; op->o_bd = op->o_callback->sc_private;
local_op = *original_op; on = (slap_overinst *) op->o_bd->bd_info;
local_op.o_bd->bd_info = (BackendInfo *) on->on_info->oi_orig; rc = overlay_entry_get_ov(op, &rs->sr_entry->e_nname, NULL, NULL, 0, &e, on);
rc = be_entry_get_rw(&local_op, &rs->sr_entry->e_nname, NULL, NULL, 0, &e);
local_op.o_bd->bd_info = (BackendInfo *) on;
/* /*
** if we got an entry from local backend: ** if we got an entry from local backend:
@ -613,9 +611,7 @@ static int translucent_search_cb(Operation *op, SlapReply *rs) {
an->a_next = as; an->a_next = as;
as = an; as = an;
} }
local_op.o_bd->bd_info = (BackendInfo *) on->on_info->oi_orig; overlay_entry_release_ov(op, e, 0, on);
be_entry_release_r(&local_op, e);
local_op.o_bd->bd_info = (BackendInfo *) on;
/* literally append, so locals are always last */ /* literally append, so locals are always last */
if(as) { if(as) {
@ -630,6 +626,7 @@ static int translucent_search_cb(Operation *op, SlapReply *rs) {
rs->sr_flags |= REP_ENTRY_MUSTBEFREED; rs->sr_flags |= REP_ENTRY_MUSTBEFREED;
} }
op->o_bd = db;
return(SLAP_CB_CONTINUE); return(SLAP_CB_CONTINUE);
} }
@ -642,9 +639,9 @@ static int translucent_search_cb(Operation *op, SlapReply *rs) {
static int translucent_search(Operation *op, SlapReply *rs) { static int translucent_search(Operation *op, SlapReply *rs) {
slap_overinst *on = (slap_overinst *) op->o_bd->bd_info; slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
Operation nop = *op;
translucent_info *ov = on->on_bi.bi_private; translucent_info *ov = on->on_bi.bi_private;
slap_callback cb = { NULL, NULL, NULL, NULL }; slap_callback cb = { NULL, NULL, NULL, NULL };
int rc;
Debug(LDAP_DEBUG_TRACE, "==> translucent_search: <%s> %s\n", Debug(LDAP_DEBUG_TRACE, "==> translucent_search: <%s> %s\n",
op->o_req_dn.bv_val, op->ors_filterstr.bv_val, 0); op->o_req_dn.bv_val, op->ors_filterstr.bv_val, 0);
@ -655,12 +652,15 @@ static int translucent_search(Operation *op, SlapReply *rs) {
return(rs->sr_err); return(rs->sr_err);
} }
cb.sc_response = (slap_response *) translucent_search_cb; cb.sc_response = (slap_response *) translucent_search_cb;
cb.sc_private = op; cb.sc_private = op->o_bd;
cb.sc_next = nop.o_callback; cb.sc_next = op->o_callback;
nop.o_callback = &cb; op->o_callback = &cb;
nop.o_bd = &ov->db; op->o_bd = &ov->db;
return (ov->db.bd_info->bi_op_search(&nop, rs)); rc = ov->db.bd_info->bi_op_search(op, rs);
op->o_bd = cb.sc_private;
return rc;
} }