upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-03 20:40:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#10250 Retrieve old value for attr_diff

Browse source
This commit is contained in:
Ondřej Kuzník 2024-08-13 09:26:21 +01:00 committed by Quanah Gibson-Mount
parent 87933f3ecd
commit 84cea5eb67
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
servers/slapd/syncrepl.c
View file

@ -5805,6 +5805,7 @@ void syncrepl_diff_entry( Operation *op, Attribute *old, Attribute *new,
Modifications **mods, Modifications **ml, int is_ctx)
{
Modifications **modtail = mods;
Attribute *old_orig = old;
/* We assume that attributes are saved in the same order
* in the remote and local databases. So if we walk through
@ -5815,7 +5816,9 @@ void syncrepl_diff_entry( Operation *op, Attribute *old, Attribute *new,
{
/* If we've seen this before, use its mod now */
if ( new->a_flags & SLAP_ATTR_IXADD ) {
attr_cmp( op, NULL, new, &modtail, &ml );
Attribute *tmp = attr_find( old_orig, new->a_desc );
assert( tmp != NULL );
attr_cmp( op, tmp, new, &modtail, &ml );
new = new->a_next;
continue;
}
@ -5886,7 +5889,12 @@ void syncrepl_diff_entry( Operation *op, Attribute *old, Attribute *new,
/* Newly added attributes */
while ( new ) {
attr_cmp( op, NULL, new, &modtail, &ml );
Attribute *tmp = NULL;
if ( new->a_flags & SLAP_ATTR_IXADD ) {
tmp = attr_find( old_orig, new->a_desc );
assert( tmp != NULL );
}
attr_cmp( op, tmp, new, &modtail, &ml );
new = new->a_next;
}