Commit 5c062598 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#6872 fix test058 breakage from prev patch

parent 7bdf930f
...@@ -2548,6 +2548,21 @@ syncprov_op_search( Operation *op, SlapReply *rs ) ...@@ -2548,6 +2548,21 @@ syncprov_op_search( Operation *op, SlapReply *rs )
i++; i++;
} }
if (srs->sr_state.numcsns != numcsns) {
/* consumer doesn't have the right number of CSNs */
changed = SS_CHANGED;
if ( srs->sr_state.ctxcsn ) {
ber_bvarray_free_x( srs->sr_state.ctxcsn, op->o_tmpmemctx );
srs->sr_state.ctxcsn = NULL;
}
if ( srs->sr_state.sids ) {
slap_sl_free( srs->sr_state.sids, op->o_tmpmemctx );
srs->sr_state.sids = NULL;
}
srs->sr_state.numcsns = 0;
goto shortcut;
}
/* Find the smallest CSN which differs from contextCSN */ /* Find the smallest CSN which differs from contextCSN */
mincsn.bv_len = 0; mincsn.bv_len = 0;
maxcsn.bv_len = 0; maxcsn.bv_len = 0;
...@@ -2594,7 +2609,6 @@ bailout: ...@@ -2594,7 +2609,6 @@ bailout:
} }
/* If nothing has changed, shortcut it */ /* If nothing has changed, shortcut it */
if ( srs->sr_state.numcsns == numcsns ) {
if ( !changed && !dirty ) { if ( !changed && !dirty ) {
do_present = 0; do_present = 0;
no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) { no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
...@@ -2612,10 +2626,7 @@ no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) { ...@@ -2612,10 +2626,7 @@ no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
} }
goto shortcut; goto shortcut;
} }
} else {
/* consumer doesn't have the right number of CSNs */
changed = SS_CHANGED;
}
/* Do we have a sessionlog for this search? */ /* Do we have a sessionlog for this search? */
sl=si->si_logs; sl=si->si_logs;
if ( sl ) { if ( sl ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment