mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#8432 fix infinite looping mods in delta-mmr

Browse Source
This commit is contained in:
Howard Chu 2016-06-09 22:37:54 +01:00
parent 2e60bf5ed0
commit 92724fd39e
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
servers/slapd/syncrepl.c
View File

@ -945,6 +945,10 @@ do_syncrep2(
check_syncprov( op, si ); check_syncprov( op, si );
ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex ); ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
for ( i =0; i<si->si_cookieState->cs_num; i++ ) { for ( i =0; i<si->si_cookieState->cs_num; i++ ) {
#ifdef CHATTY_SYNCLOG
Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s CSN for sid %d: %s\n",
si->si_ridtxt, i, si->si_cookieState->cs_vals[i].bv_val );
#endif
/* new SID */ /* new SID */
if ( sid < si->si_cookieState->cs_sids[i] ) if ( sid < si->si_cookieState->cs_sids[i] )
break; break;
@ -2099,6 +2103,33 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
if ( !mod ) if ( !mod )
return SLAP_CB_CONTINUE; return SLAP_CB_CONTINUE;
{
int i, sid;
sid = slap_parse_csn_sid( &mod->sml_nvalues[0] );
ldap_pvt_thread_mutex_lock( &si->si_cookieState->cs_mutex );
for ( i =0; i<si->si_cookieState->cs_num; i++ ) {
#ifdef CHATTY_SYNCLOG
Debug( LDAP_DEBUG_SYNC, "syncrepl_op_modify: %s CSN for sid %d: %s\n",
si->si_ridtxt, i, si->si_cookieState->cs_vals[i].bv_val );
#endif
/* new SID */
if ( sid < si->si_cookieState->cs_sids[i] )
break;
if ( si->si_cookieState->cs_sids[i] == sid ) {
if ( ber_bvcmp( &mod->sml_nvalues[0], &si->si_cookieState->cs_vals[i] ) <= 0 ) {
Debug( LDAP_DEBUG_SYNC, "syncrepl_op_modify: %s entryCSN too old, ignoring %s (%s)\n",
si->si_ridtxt, mod->sml_nvalues[0].bv_val, op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
slap_graduate_commit_csn( op );
/* tell accesslog this was a failure */
rs->sr_err = LDAP_TYPE_OR_VALUE_EXISTS;
return LDAP_SUCCESS;
}
}
}
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
}
rc = overlay_entry_get_ov( op, &op->o_req_ndn, NULL, NULL, 0, &e, on ); rc = overlay_entry_get_ov( op, &op->o_req_ndn, NULL, NULL, 0, &e, on );
if ( rc == 0 ) { if ( rc == 0 ) {
Attribute *a; Attribute *a;
@ -2112,6 +2143,7 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
} }
/* equal? Should never happen */ /* equal? Should never happen */
if ( match == 0 ) { if ( match == 0 ) {
slap_graduate_commit_csn( op );
/* tell accesslog this was a failure */ /* tell accesslog this was a failure */
rs->sr_err = LDAP_TYPE_OR_VALUE_EXISTS; rs->sr_err = LDAP_TYPE_OR_VALUE_EXISTS;
return LDAP_SUCCESS; return LDAP_SUCCESS;