mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-30 13:30:57 +08:00
Check for duplicate UUIDs due to ITS#4813 patch
This commit is contained in:
parent
0126348461
commit
c49f17bfdd
@ -828,9 +828,10 @@ do_syncrep2(
|
||||
struct berval *syncuuid_bv;
|
||||
syncuuid_bv = ber_dupbv( NULL, &syncUUIDs[i] );
|
||||
slap_sl_free( syncUUIDs[i].bv_val,op->o_tmpmemctx );
|
||||
avl_insert( &si->si_presentlist,
|
||||
if ( avl_insert( &si->si_presentlist,
|
||||
(caddr_t) syncuuid_bv,
|
||||
syncuuid_cmp, avl_dup_error );
|
||||
syncuuid_cmp, avl_dup_error ))
|
||||
ber_bvfree( syncuuid_bv );
|
||||
}
|
||||
slap_sl_free( syncUUIDs, op->o_tmpmemctx );
|
||||
}
|
||||
@ -1608,8 +1609,11 @@ syncrepl_entry(
|
||||
if (( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_ADD )) {
|
||||
if ( !si->si_refreshPresent ) {
|
||||
syncuuid_bv = ber_dupbv( NULL, syncUUID );
|
||||
avl_insert( &si->si_presentlist, (caddr_t) syncuuid_bv,
|
||||
syncuuid_cmp, avl_dup_error );
|
||||
if ( avl_insert( &si->si_presentlist, (caddr_t) syncuuid_bv,
|
||||
syncuuid_cmp, avl_dup_error )) {
|
||||
ber_bvfree( syncuuid_bv );
|
||||
syncuuid_bv = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user