From: Howard Chu <hyc@openldap.org>
Date: Fri, 23 May 2014 13:56:56 +0000 (-0700)
Subject: ITS#7849 make sure to send cookie after fallback
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ec884bc271ccc26ae97dca1eda38c221f86139b;p=openldap

ITS#7849 make sure to send cookie after fallback
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 4ea8a70716..8e75fe8796 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1539,6 +1539,10 @@ reload:
 		op->o_ndn = op->o_bd->be_rootndn;
 		rc = do_syncrep2( op, si );
 		if ( rc == LDAP_SYNC_REFRESH_REQUIRED )	{
+			if ( BER_BVISNULL( &si->si_syncCookie.octet_str ))
+				slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
+					si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
+					si->si_syncCookie.sid );
 			rc = ldap_sync_search( si, op->o_tmpmemctx );
 			goto reload;
 		}