mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#9345 syncrepl: call check_syncprov on freshly started consumer

Browse Source
This commit is contained in:
Howard Chu 2020-09-12 21:38:20 +01:00
parent 47ec168779
commit 57643b4347
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/syncrepl.c
View File

@ -1067,12 +1067,8 @@ do_syncrep1(
} }
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex ); ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
} }
}
ch_free( si->si_syncCookie.octet_str.bv_val );
slap_compose_sync_cookie( NULL, &si->si_syncCookie.octet_str,
si->si_syncCookie.ctxcsn, si->si_syncCookie.rid,
si->si_syncCookie.sid, NULL );
} else {
/* ITS#6367: recreate the cookie so it has our SID, not our peer's */ /* ITS#6367: recreate the cookie so it has our SID, not our peer's */
ch_free( si->si_syncCookie.octet_str.bv_val ); ch_free( si->si_syncCookie.octet_str.bv_val );
BER_BVZERO( &si->si_syncCookie.octet_str ); BER_BVZERO( &si->si_syncCookie.octet_str );
@ -1084,8 +1080,6 @@ do_syncrep1(
si->si_syncCookie.sid, NULL ); si->si_syncCookie.sid, NULL );
} }
}
Debug( LDAP_DEBUG_SYNC, "do_syncrep1: %s starting refresh (sending cookie=%s)\n", Debug( LDAP_DEBUG_SYNC, "do_syncrep1: %s starting refresh (sending cookie=%s)\n",
si->si_ridtxt, si->si_syncCookie.octet_str.bv_val ); si->si_ridtxt, si->si_syncCookie.octet_str.bv_val );