From: Howard Chu <hyc@openldap.org>
Date: Sat, 11 Aug 2007 02:11:27 +0000 (+0000)
Subject: ITS#5087 fix tool_id2entry_get for hdb
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~242
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed4b5d1bd76aed7be2e1df35942f9dc7398a8d02;p=openldap

ITS#5087 fix tool_id2entry_get for hdb
TODO: rip this all out and just use tool_entry_get
---

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index e95ca16594..dd8f0235cf 100644
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -174,6 +174,32 @@ int bdb_tool_entry_close(
 	return 0;
 }
 
+static int
+bdb_tool_entry_set(
+	BackendDB *be, int flag )
+{
+	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	int rc;
+	char buf[16], *dptr;
+
+	/* Get the header */
+	data.ulen = data.dlen = sizeof( buf );
+	data.data = buf;
+	data.flags |= DB_DBT_PARTIAL;
+	rc = cursor->c_get( cursor, &key, &data, flag );
+	if ( rc )
+		return rc;
+
+	dptr = eh.bv.bv_val;
+	eh.bv.bv_val = buf;
+	eh.bv.bv_len = data.size;
+	rc = entry_header( &eh );
+	eoff = eh.data - eh.bv.bv_val;
+	eh.bv.bv_val = dptr;
+
+	return rc;
+}
+
 ID bdb_tool_entry_next(
 	BackendDB *be )
 {
@@ -185,12 +211,8 @@ ID bdb_tool_entry_next(
 	assert( be != NULL );
 	assert( slapMode & SLAP_TOOL_MODE );
 	assert( bdb != NULL );
-	
-	/* Get the header */
-	data.ulen = data.dlen = sizeof( buf );
-	data.data = buf;
-	data.flags |= DB_DBT_PARTIAL;
-	rc = cursor->c_get( cursor, &key, &data, DB_NEXT );
+
+	rc = bdb_tool_entry_set( be, DB_NEXT );
 
 	if( rc ) {
 		/* If we're doing linear indexing and there are more attrs to
@@ -201,7 +223,7 @@ ID bdb_tool_entry_next(
 			bdb_attr_info_free( bdb->bi_attrs[0] );
 			bdb->bi_attrs[0] = bdb->bi_attrs[index_nattrs];
 			index_nattrs--;
-			rc = cursor->c_get( cursor, &key, &data, DB_FIRST );
+			rc = bdb_tool_entry_set( be, DB_FIRST );
 			if ( rc ) {
 				return NOID;
 			}
@@ -210,16 +232,6 @@ ID bdb_tool_entry_next(
 		}
 	}
 
-	dptr = eh.bv.bv_val;
-	eh.bv.bv_val = buf;
-	eh.bv.bv_len = data.size;
-	rc = entry_header( &eh );
-	eoff = eh.data - eh.bv.bv_val;
-	eh.bv.bv_val = dptr;
-	if( rc ) {
-		return NOID;
-	}
-
 	BDB_DISK2ID( key.data, &id );
 	return id;
 }
@@ -256,19 +268,24 @@ int bdb_tool_id2entry_get(
 	Entry **e
 )
 {
-	int rc = bdb_id2entry( be, NULL, 0, id, e );
-
-	if ( rc == DB_NOTFOUND && id == 0 ) {
-		Entry *dummy = ch_calloc( 1, sizeof(Entry) );
-		struct berval gluebv = BER_BVC("glue");
-		dummy->e_name.bv_val = ch_strdup( "" );
-		dummy->e_nname.bv_val = ch_strdup( "" );
-		attr_merge_one( dummy, slap_schema.si_ad_objectClass, &gluebv, NULL );
-		attr_merge_one( dummy, slap_schema.si_ad_structuralObjectClass,
-			&gluebv, NULL );
-		*e = dummy;
-		rc = LDAP_SUCCESS;
-	}
+	int rc;
+	ID nid;
+
+	BDB_ID2DISK( id, &nid );
+	key.ulen = key.size = sizeof(ID);
+	key.flags = DB_DBT_USERMEM;
+	key.data = &nid;
+
+	rc = bdb_tool_entry_set( be, DB_SET );
+	if ( rc == 0 )
+		*e = bdb_tool_entry_get( be, id );
+	if ( *e )
+		rc = 0;
+	else
+		rc = LDAP_OTHER;
+
+	key.data = NULL;
+
 	return rc;
 }