From 1df2b85c320fedda4be2c671998eca8893981ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Fri, 26 Apr 2019 10:28:21 +0100 Subject: [PATCH] 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. --- servers/slapd/overlays/syncprov.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index b853a9f31a..d24b18ce9e 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -3212,11 +3212,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;