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#5470 also ignore presentlist if number of CSNs don't match

Browse Source
This commit is contained in:
Howard Chu 2008-04-19 23:27:49 +00:00
parent 49bb4d5633
commit 1af2849f7c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
servers/slapd/syncrepl.c
View File

@ -946,7 +946,8 @@ do_syncrep2(
* 2) on err policy : stop service, stop sync, retry * 2) on err policy : stop service, stop sync, retry
*/ */
if ( refreshDeletes == 0 && match < 0 && if ( refreshDeletes == 0 && match < 0 &&
err == LDAP_SUCCESS ) err == LDAP_SUCCESS &&
syncCookie_req.numcsns == syncCookie.numcsns )
{ {
syncrepl_del_nonpresent( op, si, NULL, syncrepl_del_nonpresent( op, si, NULL,
&syncCookie.ctxcsn[m] ); &syncCookie.ctxcsn[m] );
@ -1095,7 +1096,8 @@ do_syncrep2(
} }
if ( match < 0 ) { if ( match < 0 ) {
if ( si->si_refreshPresent == 1 ) { if ( si->si_refreshPresent == 1 &&
syncCookie_req.numcsns == syncCookie.numcsns ) {
syncrepl_del_nonpresent( op, si, NULL, syncrepl_del_nonpresent( op, si, NULL,
&syncCookie.ctxcsn[m] ); &syncCookie.ctxcsn[m] );
} }