mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7904 init wwctx earlier

Browse Source
This commit is contained in:
Howard Chu 2014-08-27 11:50:32 +01:00
parent cac00c6a97
commit b669f5b706
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
servers/slapd/back-mdb/search.c
View File

@ -682,6 +682,17 @@ dn2entry_retry:
tentries = ncand;
}
wwctx.flag = 0;
/* If we're running in our own read txn */
if ( moi == &opinfo ) {
cb.sc_writewait = mdb_writewait;
cb.sc_private = &wwctx;
wwctx.txn = ltid;
wwctx.mcd = NULL;
cb.sc_next = op->o_callback;
op->o_callback = &cb;
}
if ( get_pagedresults( op ) > SLAP_CONTROL_IGNORED ) {
PagedResultsState *ps = op->o_pagedresults_state;
/* deferred cookie parsing */
@ -740,17 +751,6 @@ dn2entry_retry:
cscope = 1; /* skip original base */
} else {
id = mdb_idl_first( candidates, &cursor );
wwctx.mcd = NULL;
}
wwctx.flag = 0;
/* If we're running in our own read txn */
if ( moi == &opinfo ) {
cb.sc_writewait = mdb_writewait;
cb.sc_private = &wwctx;
wwctx.txn = ltid;
cb.sc_next = op->o_callback;
op->o_callback = &cb;
}
while (id != NOID)