From: Ondřej Kuzník <ondra@openldap.org>
Date: Tue, 7 May 2019 18:03:13 +0000 (+0100)
Subject: ITS#9015 Treat an empty cookie from a FALLBACK search as a success
X-Git-Tag: OPENLDAP_REL_ENG_2_4_48~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=058c622c0ec751f3099cbea0a87d6012b3620c50;p=thirdparty%2Fopenldap.git

ITS#9015 Treat an empty cookie from a FALLBACK search as a success
---

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 {