Commit 22c38fe6 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

Remove ITS#5973 from RE24.

parent 9f19b2aa
......@@ -19,7 +19,6 @@ OpenLDAP 2.4.16 Engineering
Fixed slapo-accesslog interaction with ppolicy (ITS#5979)
Fixed slapo-dynlist conversion to cn=config (ITS#6002)
Fixed slapo-syncprov newCookie sync messages (ITS#5972)
Fixed slapo-syncprov multiple CSN propagation (ITS#5973)
Build Environment
Cleaned up alloc/free functions for Windows (ITS#6005)
Documentation
......
......@@ -1659,56 +1659,6 @@ syncprov_op_response( Operation *op, SlapReply *rs )
maxcsn.bv_len = sizeof(cbuf);
ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
if ( op->o_dont_replicate &&
op->orm_modlist->sml_op == LDAP_MOD_REPLACE &&
op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) {
/* Catch contextCSN updates from syncrepl. We have to look at
* all the attribute values, as there may be more than one csn
* that changed, and only one can be passed in the csn queue.
*/
Modifications *mod = op->orm_modlist;
int i, j, sid;
for ( i=0; i<mod->sml_numvals; i++ ) {
sid = slap_parse_csn_sid( &mod->sml_values[i] );
for ( j=0; j<si->si_numcsns; j++ ) {
if ( sid == si->si_sids[j] ) {
if ( ber_bvcmp( &mod->sml_values[i], &si->si_ctxcsn[j] ) > 0 ) {
ber_bvreplace( &si->si_ctxcsn[j], &mod->sml_values[i] );
csn_changed = 1;
}
break;
}
}
if ( j == si->si_numcsns ) {
value_add_one( &si->si_ctxcsn, &mod->sml_values[i] );
si->si_numcsns++;
si->si_sids = ch_realloc( si->si_sids, si->si_numcsns *
sizeof(int));
si->si_sids[j] = sid;
csn_changed = 1;
}
}
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
if ( csn_changed ) {
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
have_psearches = ( si->si_ops != NULL );
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
if ( have_psearches ) {
for ( sm = opc->smatches; sm; sm=sm->sm_next ) {
if ( sm->sm_op->s_op->o_abandon )
continue;
syncprov_qresp( opc, sm->sm_op, LDAP_SYNC_NEW_COOKIE );
}
}
}
return SLAP_CB_CONTINUE;
}
slap_get_commit_csn( op, &maxcsn, &foundit );
if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) {
/* syncrepl queues the CSN values in the db where
......
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