From 2e7e2ac4427cd708a1bfd43c6a49f1f42b37e0c6 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 27 Aug 2014 11:50:32 +0100 Subject: [PATCH] ITS#7904 init wwctx earlier --- servers/slapd/back-mdb/search.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c index f0eec7e524..f5cc881534 100644 --- a/servers/slapd/back-mdb/search.c +++ b/servers/slapd/back-mdb/search.c @@ -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) -- 2.39.5