From: Howard Chu <hyc@openldap.org>
Date: Wed, 7 Apr 2004 14:28:50 +0000 (+0000)
Subject: Import ITS#3046 fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_30~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8c4a37bc57ede70a4cbdc1b8675c76ee109cd513;p=openldap

Import ITS#3046 fix from HEAD
---

diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index 16c3e6da51..4c4a2f150c 100644
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -943,13 +943,16 @@ idl_delete_key (
 	   */
 	cont_alloc( &data, &key );
 #ifndef USE_INDIRECT_NIDS
-	for ( nids = 0; !ID_BLOCK_NOID(idl, nids); nids++ )
-		;	/* NULL */
+	for ( nids = 0; !ID_BLOCK_NOID(idl, nids); nids++ ) {
+		;	/* Empty */
+	}
 
 	for ( j = 0; j<nids; j++ ) 
 #else
 	nids = ID_BLOCK_NIDS(idl);
-	for ( j = idl_find(idl, id); j >= 0; j = -1)	/* execute once */
+	j = idl_find(idl, id);
+	if ( ID_BLOCK_ID(idl, j) > id ) j--;
+	for (; j >= 0; j = -1)	/* execute once */
 #endif
 	{
 		ID_BLOCK *tmp;