Commit ba86259a authored by Rein Tollevik's avatar Rein Tollevik
Browse files

ITS#6708: Mutex protect fixing the filter.

parent e1dfe6e9
......@@ -1294,6 +1294,7 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
}
if ( fc.fscope ) {
ldap_pvt_thread_mutex_lock( &ss->s_mutex );
op2 = *ss->s_op;
oh = *op->o_hdr;
oh.oh_conn = ss->s_op->o_conn;
......@@ -1302,7 +1303,6 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
op2.o_hdr = &oh;
op2.o_extra = op->o_extra;
op2.o_callback = NULL;
ldap_pvt_thread_mutex_lock( &ss->s_mutex );
if (ss->s_flags & PS_FIX_FILTER) {
/* Skip the AND/GE clause that we stuck on in front. We
would lose deletes/mods that happen during the refresh
......@@ -2607,10 +2607,14 @@ shortcut:
#endif
ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx );
fava->f_next = op->ors_filter;
if ( sop )
ldap_pvt_thread_mutex_lock( &sop->s_mutex );
op->ors_filter = fand;
filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
if ( sop )
if ( sop ) {
sop->s_flags |= PS_FIX_FILTER;
ldap_pvt_thread_mutex_unlock( &sop->s_mutex );
}
}
/* Let our callback add needed info to returned entries */
......
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