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 Simplify attr_cmp calling convention

Browse source 
We no longer need the kludge to touch up modifiersName/modifyTimestamp
(ITS#4820) since the mod is being passed to the backend with
orm_no_opattrs these days.
This commit is contained in:
Ondřej Kuzník 2025-12-16 12:06:49 +00:00 committed by Quanah Gibson-Mount
parent 0e893fd788
commit 87933f3ecd
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
servers/slapd/syncrepl.c
View file

@ -5653,6 +5653,10 @@ attr_cmp( Operation *op, Attribute *old, Attribute *new,
modtail = *mret;
if ( old && (old->a_flags & SLAP_ATTR_SORTED_VALS) ) {
return sorted_attr_cmp( op, old, new, mret, mcur );
}
if ( old ) {
int n, o, nn, no;
struct berval **adds, **dels;
@ -5856,18 +5860,7 @@ void syncrepl_diff_entry( Operation *op, Attribute *old, Attribute *new,
old = old->a_next;
continue;
}
/* kludge - always update modifiersName so that it
* stays co-located with the other mod opattrs. But only
* if we know there are other valid mods.
*/
if ( *mods && ( old->a_desc == slap_schema.si_ad_modifiersName ||
old->a_desc == slap_schema.si_ad_modifyTimestamp )) {
attr_cmp( op, NULL, new, &modtail, &ml );
} else if ( old->a_flags & SLAP_ATTR_SORTED_VALS ) {
sorted_attr_cmp( op, old, new, &modtail, &ml );
} else {
attr_cmp( op, old, new, &modtail, &ml );
}
attr_cmp( op, old, new, &modtail, &ml );
new = new->a_next;
old = old->a_next;