From f4b98b256c53126cf53940e5125e0df35eb33025 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Tue, 2 Sep 2008 20:35:51 +0000 Subject: [PATCH] use the most recent contextCSN (ITS#5675) --- servers/slapd/syncrepl.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 4378ee9383..a921453294 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -473,7 +473,7 @@ check_syncprov( for ( i=0; isi_cookieState->cs_vals[i] )) { - changed =1; + changed = 1; break; } } @@ -2770,8 +2770,13 @@ syncrepl_updateCookie( if ( memcmp( syncCookie->ctxcsn[i].bv_val, si->si_cookieState->cs_vals[j].bv_val, len ) > 0 ) { mod.sml_values[j] = syncCookie->ctxcsn[i]; - if ( BER_BVISNULL( &first )) + if ( BER_BVISNULL( &first ) ) { + first = syncCookie->ctxcsn[i]; + + } else if ( memcmp( syncCookie->ctxcsn[i].bv_val, first.bv_val, first.bv_len ) > 0 ) + { first = syncCookie->ctxcsn[i]; + } } break; } @@ -2781,8 +2786,12 @@ syncrepl_updateCookie( ( mod.sml_numvals+2 )*sizeof(struct berval), op->o_tmpmemctx ); mod.sml_values[mod.sml_numvals++] = syncCookie->ctxcsn[i]; BER_BVZERO( &mod.sml_values[mod.sml_numvals] ); - if ( BER_BVISNULL( &first )) + if ( BER_BVISNULL( &first ) ) { + first = syncCookie->ctxcsn[i]; + } else if ( memcmp( syncCookie->ctxcsn[i].bv_val, first.bv_val, first.bv_len ) > 0 ) + { first = syncCookie->ctxcsn[i]; + } } } /* Should never happen, ITS#5065 */ -- 2.39.5