From a31a8ed20ea3e39ea00b3a284aa172a84cd09608 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 29 Jul 2011 13:05:45 -0700 Subject: [PATCH] ITS#6999 fix syncrepl timeout in refreshAndPersist --- servers/slapd/syncrepl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 7178270849..9d3d9f56ce 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -823,7 +823,7 @@ do_syncrep2( slap_dup_sync_cookie( &syncCookie_req, &si->si_syncCookie ); - if ( abs(si->si_type) == LDAP_SYNC_REFRESH_AND_PERSIST ) { + if ( abs(si->si_type) == LDAP_SYNC_REFRESH_AND_PERSIST && si->si_refreshDone ) { tout_p = &tout; } else { tout_p = NULL; @@ -1241,6 +1241,9 @@ do_syncrep2( si->si_refreshDone = 1; } ber_scanf( ber, /*"{"*/ "}" ); + if ( abs(si->si_type) == LDAP_SYNC_REFRESH_AND_PERSIST && + si->si_refreshDone ) + tout_p = &tout; break; case LDAP_TAG_SYNC_ID_SET: Debug( LDAP_DEBUG_SYNC, -- 2.39.5