From: Ondřej Kuzník <ondra@openldap.org>
Date: Thu, 18 Oct 2018 09:33:22 +0000 (+0100)
Subject: Skip ITS#6545 transition markers when we change mod op
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df83989f0fe5bcffb42a426346d2362a8f8898cd;p=thirdparty%2Fopenldap.git

Skip ITS#6545 transition markers when we change mod op
---

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 2804b92894..f230b0dbc8 100644
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1668,7 +1668,8 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
 			}
 			/* ITS#6545: when the same attribute is edited multiple times,
 			 * record the transition */
-			if ( m->sml_next && m->sml_desc == m->sml_next->sml_desc ) {
+			if ( m->sml_next && m->sml_desc == m->sml_next->sml_desc &&
+					m->sml_op == m->sml_next->sml_op ) {
 				ber_str2bv( ":", STRLENOF(":"), 1, &vals[i] );
 				i++;
 			}