From: Howard Chu <hyc@openldap.org>
Date: Wed, 26 Jul 2006 21:36:44 +0000 (+0000)
Subject: ITS#4622 additional fix
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~40
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=acea44af0243d71fe535d88d9d017664891838b0;p=openldap

ITS#4622 additional fix
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 919d73836c..d0c94978cb 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -953,15 +953,14 @@ do_syncrep2(
 							&syncCookie.ctxcsn, &text );
 					}
 
-					if ( !BER_BVISNULL( &syncCookie.ctxcsn ) &&
-						match < 0 )
-					{
-						rc = syncrepl_updateCookie( si, op, psub, &syncCookie);
-					}
+					if ( match < 0 ) {
+						if ( si->si_refreshPresent == 1 ) {
+							syncrepl_del_nonpresent( op, si, NULL, &syncCookie.ctxcsn );
+						}
 
-					if ( si->si_refreshPresent == 1 ) {
-						if ( match < 0 ) {
-							syncrepl_del_nonpresent( op, si, NULL, NULL );
+						if ( !BER_BVISNULL( &syncCookie.ctxcsn ))
+						{
+							rc = syncrepl_updateCookie( si, op, psub, &syncCookie);
 						}
 					}