From: Howard Chu <hyc@openldap.org>
Date: Sat, 12 Sep 2020 20:38:20 +0000 (+0100)
Subject: ITS#9345 syncrepl: call check_syncprov on freshly started consumer
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~10^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57643b43470e4cb807ccbc762af3ef7267c4fdd8;p=thirdparty%2Fopenldap.git

ITS#9345 syncrepl: call check_syncprov on freshly started consumer
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 781eca70b8..65ab22fede 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1067,12 +1067,8 @@ do_syncrep1(
 			}
 			ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
 		}
+		}
 
-		ch_free( si->si_syncCookie.octet_str.bv_val );
-		slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
-			si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
-			si->si_syncCookie.sid, NULL );
-	} else {
 		/* ITS#6367: recreate the cookie so it has our SID, not our peer's */
 		ch_free( si->si_syncCookie.octet_str.bv_val );
 		BER_BVZERO( &si->si_syncCookie.octet_str );
@@ -1084,8 +1080,6 @@ do_syncrep1(
 				si->si_syncCookie.sid, NULL );
 	}
 
-	}
-
 	Debug( LDAP_DEBUG_SYNC, "do_syncrep1: %s starting refresh (sending cookie=%s)\n",
 		si->si_ridtxt, si->si_syncCookie.octet_str.bv_val );