From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Wed, 30 Sep 2020 18:31:40 +0000 (+0100)
Subject: ITS#9295 Do not replace 'op'
X-Git-Tag: OPENLDAP_REL_ENG_2_4_54~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ff00e1d5fd4580b592d0b42c5512cdfda7ad1f8;p=thirdparty%2Fopenldap.git

ITS#9295 Do not replace 'op'
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 7e8a172825..9f2d57c9d5 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1956,8 +1956,6 @@ syncrepl_accesslog_mods(
 
 		if ( !mod || ad != mod->sml_desc || op != mod->sml_op ) {
 			mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-			if ( op == LDAP_MOD_ADD && is_at_single_value( ad->ad_type ))
-				op = LDAP_MOD_REPLACE;
 			mod->sml_flags = 0;
 			mod->sml_op = op;
 			mod->sml_next = NULL;
@@ -1967,6 +1965,10 @@ syncrepl_accesslog_mods(
 			mod->sml_nvalues = NULL;
 			mod->sml_numvals = 0;
 
+			/* Keep 'op' to reflect what we read out from accesslog */
+			if ( op == LDAP_MOD_ADD && is_at_single_value( ad->ad_type ))
+				mod->sml_op = LDAP_MOD_REPLACE;
+
 			*modtail = mod;
 			modtail = &mod->sml_next;
 		}