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

ITS#8036 fix regression from ITS#7904

Browse Source
This commit is contained in:
Howard Chu 2015-01-27 22:26:33 +00:00
parent b53d813413
commit 969d477168
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,15 +358,27 @@ mdb_writewait( Operation *op, slap_callback *sc )
}
static int
mdb_waitfixup( Operation *op, ww_ctx *ww, MDB_cursor *mci, MDB_cursor *mcd )
mdb_waitfixup( Operation *op, ww_ctx *ww, MDB_cursor *mci, MDB_cursor *mcd, ID2 *scopes )
{
int rc = 0;
ww->flag = 0;
mdb_txn_renew( ww->txn );
mdb_cursor_renew( ww->txn, mci );
mdb_cursor_renew( ww->txn, mcd );
if ( scopes[0].mid > 1 ) {
MDB_val key;
int i;
key.mv_size = sizeof(ID);
for ( i=1; i<scopes[0].mid; i++ ) {
key.mv_data = &scopes[i].mid;
mdb_cursor_get( mcd, &key, &scopes[i].mval, MDB_SET );
}
}
if ( ww->mcd ) {
MDB_val key, data;
key.mv_size = sizeof(ID);
key.mv_data = &ww->key;
data = ww->data;
@ -1035,7 +1047,7 @@ notfound:
rs->sr_ref = NULL;
if ( wwctx.flag ) {
rs->sr_err = mdb_waitfixup( op, &wwctx, mci, mcd );
rs->sr_err = mdb_waitfixup( op, &wwctx, mci, mcd, scopes );
if ( rs->sr_err ) {
send_ldap_result( op, rs );
goto done;
@ -1097,7 +1109,7 @@ notfound:
goto done;
}
if ( wwctx.flag ) {
rs->sr_err = mdb_waitfixup( op, &wwctx, mci, mcd );
rs->sr_err = mdb_waitfixup( op, &wwctx, mci, mcd, scopes );
if ( rs->sr_err ) {
send_ldap_result( op, rs );
goto done;