From 058c622c0ec751f3099cbea0a87d6012b3620c50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Tue, 7 May 2019 19:03:13 +0100 Subject: [PATCH] ITS#9015 Treat an empty cookie from a FALLBACK search as a success --- servers/slapd/syncrepl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 07da8f6287..ad395820cc 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -417,7 +417,7 @@ ldap_sync_search( /* If we're using a log but we have no state, then fallback to * normal mode for a full refresh. */ - if ( si->si_syncdata && !si->si_syncCookie.numcsns ) { + if ( si->si_syncdata && !si->si_syncCookie.numcsns && !si->si_refreshDone ) { si->si_logstate = SYNCLOG_FALLBACK; } @@ -1194,6 +1194,7 @@ do_syncrep2( if ( err == LDAP_SUCCESS && si->si_logstate == SYNCLOG_FALLBACK ) { si->si_logstate = SYNCLOG_LOGGING; + si->si_refreshDone = 1; rc = LDAP_SYNC_REFRESH_REQUIRED; slap_resume_listeners(); } else { -- 2.47.2