From: Ondřej Kuzník <ondra@openldap.org>
Date: Fri, 26 Apr 2019 09:28:21 +0000 (+0100)
Subject: ITS#9015 Generate contextCSN unless we're a pure replica.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_48~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc3a7e3dfdef2dcbdfd173e8da83905d6aa23c33;p=thirdparty%2Fopenldap.git

ITS#9015 Generate contextCSN unless we're a pure replica.

Essentially reverts part of cd8ff37629012c1676ef79de164a159da9b2ae89 to
make sure there is always a contextCSN if the server is in charge of its
own serverID.
---

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 09366e140b..259ac910a3 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -3192,11 +3192,8 @@ syncprov_db_open(
 		char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
 		struct berval csn;
 
-		if ( slap_serverID || SLAP_SYNC_SHADOW( op->o_bd )) {
-		/* If we're also a consumer, then don't generate anything.
-		 * Wait for our provider to send it to us, or for a local
-		 * modify if we have multimaster.
-		 */
+		if ( SLAP_SINGLE_SHADOW( op->o_bd ) ) {
+			/* Not in charge of this serverID, don't generate anything. */
 			goto out;
 		}
 		csn.bv_val = csnbuf;