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 f19217f0ac1d4f25e0dc01445e90033c2a3d75ef..2d1913b4a7b1844143ee7a6052618ab3c195d37a 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -553,7 +553,8 @@ ldap_sync_search(
                        }
                } else
 #endif
-               if ( si->si_logstate == SYNCLOG_LOGGING && !si->si_syncCookie.numcsns ) {
+               if ( si->si_logstate == SYNCLOG_LOGGING && !si->si_syncCookie.numcsns &&
+                               !si->si_refreshDone ) {
                        si->si_logstate = SYNCLOG_FALLBACK;
                }
        }
@@ -1492,6 +1493,7 @@ logerr:
                        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 {