upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9338 syncrepl: Don't reuse existing connection on Refresh fallback

Browse source
This commit is contained in:
Howard Chu 2020-09-04 13:39:00 +01:00
parent ed356c55d9
commit 0b20b92ec1
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/syncrepl.c
View file

@ -1842,7 +1842,8 @@ done:
if ( msg ) ldap_msgfree( msg );
if ( rc && rc != LDAP_SYNC_REFRESH_REQUIRED && si->si_ld ) {
if ( rc ) {
/* never reuse existing connection */
if ( si->si_conn ) {
connection_client_stop( si->si_conn );
si->si_conn = NULL;
@ -1958,6 +1959,7 @@ do_syncrepl(
if ( !si->si_schemachecking )
op->o_no_schema_check = 1;
reload:
/* Establish session, do search */
if ( !si->si_ld ) {
si->si_refreshDelete = 0;
@ -1975,7 +1977,6 @@ do_syncrepl(
rc = do_syncrep1( op, si );
}
reload:
/* Process results */
if ( rc == LDAP_SUCCESS ) {
ldap_get_option( si->si_ld, LDAP_OPT_DESC, &s );
@ -1986,11 +1987,6 @@ 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, NULL );
rc = ldap_sync_search( si, op->o_tmpmemctx );
goto reload;
}