upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-19 21:32:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dirsync delete/modrdn fixes

Browse source 
Delete could try to queue a NULL syncCSN (dirsync has none)
Modrdn could try to delete a nonexistent oldRDN (leftover from #7144)
This commit is contained in:
Howard Chu 2018-12-22 05:21:56 -08:00
parent 868750c74b
commit b4364baca7
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
servers/slapd/syncrepl.c
View file

@ -3615,7 +3615,7 @@ retry_add:;
op->o_req_ndn = dni.ndn;
if ( dni.renamed ) {
struct berval noldp, newp;
Modifications *mod, **modtail, **ml, *m2;
Modifications *mod, **modtail, **ml, *m2 = NULL;
int i, got_replace = 0, just_rename = 0;
SlapReply rs_modify = {REP_RESULT};
@ -3863,7 +3863,7 @@ retry_modrdn:;
op->o_req_ndn = dni.ndn;
op->o_tag = LDAP_REQ_DELETE;
op->o_bd = si->si_wbe;
if ( !syncCSN ) {
if ( !syncCSN && si->si_syncCookie.ctxcsn ) {
slap_queue_csn( op, si->si_syncCookie.ctxcsn );
}
rc = op->o_bd->be_delete( op, &rs_delete );
@ -4847,16 +4847,18 @@ dn_callback(
/* a should not be NULL but apparently it happens.
* ITS#7144
*/
dni->oldNcount = a ? a->a_numvals : 0;
for ( newpos=0, a=dni->new_entry->e_attrs;
a && a->a_desc != ad; newpos++, a=a->a_next );
if ( !a || oldpos != newpos || attr_valfind( a,
SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH |
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
SLAP_MR_VALUE_OF_SYNTAX,
&oldVal, NULL, op->o_tmpmemctx ) != LDAP_SUCCESS )
{
dni->delOldRDN = 1;
if ( a ) {
dni->oldNcount = a->a_numvals;
for ( newpos=0, a=dni->new_entry->e_attrs;
a && a->a_desc != ad; newpos++, a=a->a_next );
if ( !a || oldpos != newpos || attr_valfind( a,
SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH |
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
SLAP_MR_VALUE_OF_SYNTAX,
&oldVal, NULL, op->o_tmpmemctx ) != LDAP_SUCCESS )
{
dni->delOldRDN = 1;
}
}
/* Get the newRDN's desc */
dnRdn( &dni->new_entry->e_nname, &oldRDN );