ITS#7849 make sure to send cookie after fallback

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 4ea8a707169f431f4ad0fe5254f83e677fb8f1b8..8e75fe8796fdfeaca6293c3dcfe5a6dd92bc7095 100644 (file)
--- 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;
                }