]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
ITS#9015 Generate contextCSN unless we're a pure replica.
authorOndřej Kuzník <ondra@openldap.org>
Fri, 26 Apr 2019 09:28:21 +0000 (10:28 +0100)
committerOndřej Kuzník <ondra@openldap.org>
Tue, 7 May 2019 18:03:35 +0000 (19:03 +0100)
Essentially reverts part of cd8ff37629012c1676ef79de164a159da9b2ae89 to
make sure there is always a contextCSN if the server is in charge of its
own serverID.

servers/slapd/overlays/syncprov.c

index 09366e140b1d325560a1b572e82c5b4d84c4b605..259ac910a3478576c4be44ce8166477c19244151 100644 (file)
@@ -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;