From 5fd0e53b158b55d2ff457d428845a61da7c4ac8e Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 22 Sep 2005 21:22:00 +0000 Subject: [PATCH] ITS#4031 don't update syncCookie if it has invalid ctxcsn --- servers/slapd/syncrepl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 6a4e626a1b..429638165d 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -632,14 +632,14 @@ do_syncrep2( entry = NULL; modlist = NULL; if ( syncrepl_message_to_op( si, op, msg ) == LDAP_SUCCESS && - !BER_BVISNULL( &syncCookie.octet_str ) ) { + !BER_BVISNULL( &syncCookie.ctxcsn ) ) { syncrepl_updateCookie( si, op, psub, &syncCookie ); } } else if ( syncrepl_message_to_entry( si, op, msg, &modlist, &entry, syncstate ) == LDAP_SUCCESS ) { rc_efree = syncrepl_entry( si, op, entry, &modlist, syncstate, &syncUUID, &syncCookie_req, &syncCookie.ctxcsn ); - if ( !BER_BVISNULL( &syncCookie.octet_str ) ) + if ( !BER_BVISNULL( &syncCookie.ctxcsn ) ) { syncrepl_updateCookie( si, op, psub, &syncCookie ); } @@ -697,7 +697,7 @@ do_syncrep2( &syncCookie_req.ctxcsn, &syncCookie.ctxcsn, &text ); } - if ( !BER_BVISNULL( &syncCookie.octet_str ) && + if ( !BER_BVISNULL( &syncCookie.ctxcsn ) && match < 0 && err == LDAP_SUCCESS ) { syncrepl_updateCookie( si, op, psub, &syncCookie ); -- 2.39.5