From: Howard Chu <hyc@openldap.org>
Date: Mon, 6 Dec 2004 21:25:16 +0000 (+0000)
Subject: Fix inequality cursor management
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~113
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e472ed00e2a3710a33e4cbd1eaaa403b1617e00c;p=openldap

Fix inequality cursor management
---

diff --git a/servers/slapd/back-bdb/idl.c b/servers/slapd/back-bdb/idl.c
index f190b5ef44..7fcc6a0abb 100644
--- a/servers/slapd/back-bdb/idl.c
+++ b/servers/slapd/back-bdb/idl.c
@@ -478,14 +478,15 @@ bdb_idl_fetch_key(
 	if ( tid ) flags |= DB_RMW;
 
 	/* If we're not reusing an existing cursor, get a new one */
-	if( opflag != DB_NEXT )
+	if( opflag != DB_NEXT ) {
 		rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
-	else
+		if( rc != 0 ) {
+			Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
+				"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
+			return rc;
+		}
+	} else {
 		cursor = *saved_cursor;
-	if( rc != 0 ) {
-		Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
-			"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
-		return rc;
 	}
 	
 	/* If this is a LE lookup, save original key so we can determine