From: Howard Chu <hyc@openldap.org>
Date: Tue, 11 Jan 2005 05:00:59 +0000 (+0000)
Subject: Fix findmax when multiple matches are found
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~431
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=05648b22fbf6496ba179a757e33e48615c596abe;p=openldap

Fix findmax when multiple matches are found
---

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 9b89f96553..755917e1d9 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -525,7 +525,7 @@ findmax_cb( Operation *op, SlapReply *rs )
 		Attribute *a = attr_find( rs->sr_entry->e_attrs,
 			slap_schema.si_ad_entryCSN );
 
-		if ( a && ber_bvcmp( &a->a_vals[0], maxcsn )) {
+		if ( a && ber_bvcmp( &a->a_vals[0], maxcsn ) > 0 ) {
 			maxcsn->bv_len = a->a_vals[0].bv_len;
 			strcpy( maxcsn->bv_val, a->a_vals[0].bv_val );
 		}
@@ -644,8 +644,9 @@ syncprov_findcsn( Operation *op, int mode )
 		fop.ors_slimit = SLAP_NO_LIMIT;
 		cb.sc_private = &maxcsn;
 		cb.sc_response = findmax_cb;
+		strcpy( cbuf, si->si_ctxcsn.bv_val );
 		maxcsn.bv_val = cbuf;
-		maxcsn.bv_len = 0;
+		maxcsn.bv_len = si->si_ctxcsn.bv_len;
 		break;
 	case FIND_CSN:
 		cf.f_choice = LDAP_FILTER_LE;
@@ -696,10 +697,8 @@ syncprov_findcsn( Operation *op, int mode )
 
 	switch( mode ) {
 	case FIND_MAXCSN:
-		if ( maxcsn.bv_len ) {
-			strcpy( si->si_ctxcsnbuf, maxcsn.bv_val );
-			si->si_ctxcsn.bv_len = maxcsn.bv_len;
-		}
+		strcpy( si->si_ctxcsnbuf, maxcsn.bv_val );
+		si->si_ctxcsn.bv_len = maxcsn.bv_len;
 		break;
 	case FIND_CSN:
 		/* If matching CSN was not found, invalidate the context. */