X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=528c57815f15089372f2b11178150b740a4b9c08;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=abb1161bce5447f2bd89ed42668c9ad81abbe707;hpb=68822b1e15efd4ac0d6a253d42d13218f68ee698;p=openldap

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index abb1161bce..528c57815f 100644
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -1,8 +1,17 @@
 /* dn2id.c - routines to deal with the dn2id index */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -17,13 +26,12 @@
 #ifndef BDB_HIER
 int
 bdb_dn2id_add(
-	BackendDB	*be,
+	Operation *op,
 	DB_TXN *txn,
 	EntryInfo *eip,
-	Entry		*e,
-	void *ctx )
+	Entry		*e )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	int		rc;
 	DBT		key, data;
@@ -43,7 +51,7 @@ bdb_dn2id_add(
 	key.size = e->e_nname.bv_len + 2;
 	key.ulen = key.size;
 	key.flags = DB_DBT_USERMEM;
-	buf = sl_malloc( key.size, ctx );
+	buf = op->o_tmpalloc( key.size, op->o_tmpmemctx );
 	key.data = buf;
 	buf[0] = DN_BASE_PREFIX;
 	ptr.bv_val = buf + 1;
@@ -69,7 +77,7 @@ bdb_dn2id_add(
 	}
 
 #ifndef BDB_MULTIPLE_SUFFIXES
-	if( !be_issuffix( be, &ptr )) {
+	if( !be_issuffix( op->o_bd, &ptr )) {
 #endif
 		buf[0] = DN_SUBTREE_PREFIX;
 		rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
@@ -87,7 +95,7 @@ bdb_dn2id_add(
 		}
 		
 #ifdef BDB_MULTIPLE_SUFFIXES
-	if( !be_issuffix( be, &ptr )) {
+	if( !be_issuffix( op->o_bd, &ptr )) {
 #endif
 		dnParent( &ptr, &pdn );
 	
@@ -97,7 +105,7 @@ bdb_dn2id_add(
 		key.data = pdn.bv_val-1;
 		ptr = pdn;
 
-		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
+		rc = bdb_idl_insert_key( op->o_bd, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 #ifdef NEW_LOGGING
@@ -114,13 +122,14 @@ bdb_dn2id_add(
 #ifndef BDB_MULTIPLE_SUFFIXES
 	}
 
-	while( !be_issuffix( be, &ptr )) {
+	while( !be_issuffix( op->o_bd, &ptr ))
 #else
-	for (;;) {
+	for (;;)
 #endif
+	{
 		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
-		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
+		rc = bdb_idl_insert_key( op->o_bd, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 #ifdef NEW_LOGGING
@@ -135,7 +144,7 @@ bdb_dn2id_add(
 			break;
 		}
 #ifdef BDB_MULTIPLE_SUFFIXES
-		if( be_issuffix( be, &ptr )) break;
+		if( be_issuffix( op->o_bd, &ptr )) break;
 #endif
 		dnParent( &ptr, &pdn );
 
@@ -149,7 +158,7 @@ bdb_dn2id_add(
 #endif
 
 done:
-	sl_free( buf, ctx );
+	op->o_tmpfree( buf, op->o_tmpmemctx );
 #ifdef NEW_LOGGING
 	LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
 #else
@@ -160,13 +169,12 @@ done:
 
 int
 bdb_dn2id_delete(
-	BackendDB	*be,
+	Operation *op,
 	DB_TXN *txn,
 	EntryInfo	*eip,
-	Entry		*e,
-	void *ctx )
+	Entry		*e )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	int		rc;
 	DBT		key;
@@ -183,7 +191,7 @@ bdb_dn2id_delete(
 
 	DBTzero( &key );
 	key.size = e->e_nname.bv_len + 2;
-	buf = sl_malloc( key.size, ctx );
+	buf = op->o_tmpalloc( key.size, op->o_tmpmemctx );
 	key.data = buf;
 	key.flags = DB_DBT_USERMEM;
 	buf[0] = DN_BASE_PREFIX;
@@ -207,7 +215,7 @@ bdb_dn2id_delete(
 	}
 
 #ifndef BDB_MULTIPLE_SUFFIXES
-	if( !be_issuffix( be, &ptr )) {
+	if( !be_issuffix( op->o_bd, &ptr )) {
 #endif
 		buf[0] = DN_SUBTREE_PREFIX;
 		rc = db->del( db, txn, &key, 0 );
@@ -225,7 +233,7 @@ bdb_dn2id_delete(
 		}
 
 #ifdef BDB_MULTIPLE_SUFFIXES
-	if( !be_issuffix( be, &ptr )) {
+	if( !be_issuffix( op->o_bd, &ptr )) {
 #endif
 		dnParent( &ptr, &pdn );
 
@@ -235,7 +243,7 @@ bdb_dn2id_delete(
 		key.data = pdn.bv_val - 1;
 		ptr = pdn;
 
-		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
+		rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 #ifdef NEW_LOGGING
@@ -252,13 +260,13 @@ bdb_dn2id_delete(
 #ifndef BDB_MULTIPLE_SUFFIXES
 	}
 
-	while( !be_issuffix( be, &ptr )) {
+	while( !be_issuffix( op->o_bd, &ptr )) {
 #else
 	for (;;) {
 #endif
 		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
-		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
+		rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
 		if( rc != 0 ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG ( INDEX, ERR, 
@@ -272,7 +280,7 @@ bdb_dn2id_delete(
 			goto done;
 		}
 #ifdef BDB_MULTIPLE_SUFFIXES
-		if( be_issuffix( be, &ptr )) break;
+		if( be_issuffix( op->o_bd, &ptr )) break;
 #endif
 		dnParent( &ptr, &pdn );
 
@@ -286,7 +294,7 @@ bdb_dn2id_delete(
 #endif
 
 done:
-	sl_free( buf, ctx );
+	op->o_tmpfree( buf, op->o_tmpmemctx );
 #ifdef NEW_LOGGING
 	LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
 #else
@@ -297,15 +305,14 @@ done:
 
 int
 bdb_dn2id(
-	BackendDB	*be,
+	Operation *op,
 	DB_TXN *txn,
 	struct berval	*dn,
-	EntryInfo *ei,
-	void *ctx )
+	EntryInfo *ei )
 {
 	int		rc;
 	DBT		key, data;
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 
 #ifdef NEW_LOGGING
@@ -313,10 +320,9 @@ bdb_dn2id(
 #else
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
 #endif
-
 	DBTzero( &key );
 	key.size = dn->bv_len + 2;
-	key.data = sl_malloc( key.size, ctx );
+	key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
 	((char *)key.data)[0] = DN_BASE_PREFIX;
 	AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
 
@@ -347,7 +353,7 @@ bdb_dn2id(
 #endif
 	}
 
-	sl_free( key.data, ctx );
+	op->o_tmpfree( key.data, op->o_tmpmemctx );
 	return rc;
 }
 
@@ -372,7 +378,7 @@ bdb_dn2id_children(
 #endif
 	DBTzero( &key );
 	key.size = e->e_nname.bv_len + 2;
-	key.data = sl_malloc( key.size, op->o_tmpmemctx );
+	key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
 	((char *)key.data)[0] = DN_ONE_PREFIX;
 	AC_MEMCPY( &((char *)key.data)[1], e->e_nname.bv_val, key.size - 1 );
 
@@ -380,7 +386,7 @@ bdb_dn2id_children(
 	if ( bdb->bi_idl_cache_size ) {
 		rc = bdb_idl_cache_get( bdb, db, &key, NULL );
 		if ( rc != LDAP_NO_SUCH_OBJECT ) {
-			sl_free( key.data, op->o_tmpmemctx );
+			op->o_tmpfree( key.data, op->o_tmpmemctx );
 			return rc;
 		}
 	}
@@ -394,7 +400,7 @@ bdb_dn2id_children(
 	data.dlen = sizeof(id);
 
 	rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
-	sl_free( key.data, op->o_tmpmemctx );
+	op->o_tmpfree( key.data, op->o_tmpmemctx );
 
 #ifdef NEW_LOGGING
 	LDAP_LOG ( INDEX, DETAIL1, 
@@ -413,41 +419,42 @@ bdb_dn2id_children(
 
 int
 bdb_dn2idl(
-	BackendDB	*be,
-	struct berval	*dn,
-	int prefix,
+	Operation *op,
+	Entry *e,
 	ID *ids,
-	void *ctx )
+	ID *stack )
 {
 	int		rc;
 	DBT		key;
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
+	int prefix = ( op->ors_scope == LDAP_SCOPE_ONELEVEL )
+		? DN_ONE_PREFIX : DN_SUBTREE_PREFIX;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG ( INDEX, ARGS, 
-		"=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val, 0, 0 );
+	LDAP_LOG ( INDEX, ARGS, "=> bdb_dn2ididl( \"%s\" )\n",
+		e->e_nname.bv_val, 0, 0 );
 #else
-	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n",
+		e->e_nname.bv_val, 0, 0 );
 #endif
 
 #ifndef	BDB_MULTIPLE_SUFFIXES
-	if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn))
-	{
+	if ( prefix == DN_SUBTREE_PREFIX && BEI(e)->bei_parent->bei_id == 0 ) {
 		BDB_IDL_ALL(bdb, ids);
 		return 0;
 	}
 #endif
 
 	DBTzero( &key );
-	key.size = dn->bv_len + 2;
+	key.size = e->e_nname.bv_len + 2;
 	key.ulen = key.size;
 	key.flags = DB_DBT_USERMEM;
-	key.data = sl_malloc( key.size, ctx );
+	key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
 	((char *)key.data)[0] = prefix;
-	AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
+	AC_MEMCPY( &((char *)key.data)[1], e->e_nname.bv_val, key.size - 1 );
 
-	rc = bdb_idl_fetch_key( be, db, NULL, &key, ids );
+	rc = bdb_idl_fetch_key( op->o_bd, db, NULL, &key, ids );
 
 	if( rc != 0 ) {
 #ifdef NEW_LOGGING
@@ -473,7 +480,7 @@ bdb_dn2idl(
 #endif
 	}
 
-	sl_free( key.data, ctx );
+	op->o_tmpfree( key.data, op->o_tmpmemctx );
 	return rc;
 }
 #else	/* BDB_HIER */
@@ -503,7 +510,7 @@ typedef struct diskNode {
 } diskNode;
 
 /* Sort function for the sorted duplicate data items of a dn2id key.
- * Sorts based on normalized RDN, in lexical order.
+ * Sorts based on normalized RDN, in length order.
  */
 int
 hdb_dup_compare(
@@ -512,54 +519,60 @@ hdb_dup_compare(
 	const DBT *curkey
 )
 {
-	diskNode *usr = usrkey->data;
-	diskNode *cur = curkey->data;
-	short curlen, usrlen;
-	char *ptr;
-	unsigned char *pt2;
-	int rc;
-
-	/* Make sure to detect negative values in the nrdnlen */
-	ptr = (char *)&usr->nrdnlen;
-	pt2 = (unsigned char *)(ptr+1);
-
-	usrlen = ptr[0] << 8 | *pt2;
-
-	ptr = (char *)&cur->nrdnlen;
-	pt2 = (unsigned char *)(ptr+1);
+	char *u = (char *)&(((diskNode *)(usrkey->data))->nrdnlen);
+	char *c = (char *)&(((diskNode *)(curkey->data))->nrdnlen);
+	int rc, i;
 
-	curlen = ptr[0] << 8 | *pt2;
-
-	if ( usrlen < 0 ) {
-		if ( curlen < 0 ) return 0;
-		return -1;
+	/* data is not aligned, cannot compare directly */
+#ifdef WORDS_BIGENDIAN
+	for( i = 0; i < (int)sizeof(short); i++)
+#else
+	for( i = sizeof(short)-1; i >= 0; i--)
+#endif
+	{
+		rc = u[i] - c[i];
+		if( rc ) return rc;
 	}
-
-	if ( curlen < 0 ) return 1;
-
-	rc = strncmp( usr->nrdn, cur->nrdn, usrlen );
-	if ( rc == 0 ) rc = usrlen - curlen;
-	return rc;
+	return strcmp( u+sizeof(short), c+sizeof(short) );
 }
 
 /* This function constructs a full DN for a given entry.
  */
 int hdb_fix_dn(
-	Entry *e
+	Entry *e,
+	int checkit
 )
 {
 	EntryInfo *ei;
 	int rlen = 0, nrlen = 0;
 	char *ptr, *nptr;
-	
+	int max = 0;
+
+	/* count length of all DN components */
 	for ( ei = BEI(e); ei && ei->bei_id; ei=ei->bei_parent ) {
 		rlen += ei->bei_rdn.bv_len + 1;
 		nrlen += ei->bei_nrdn.bv_len + 1;
+		if (ei->bei_modrdns > max) max = ei->bei_modrdns;
+	}
+
+	/* See if the entry DN was invalidated by a subtree rename */
+	if ( checkit ) {
+		if ( BEI(e)->bei_modrdns >= max ) {
+			return 0;
+		}
+		/* We found a mismatch, tell the caller to lock it */
+		if ( checkit == 1 ) {
+			return 1;
+		}
+		/* checkit == 2. do the fix. */
+		free( e->e_name.bv_val );
+		free( e->e_nname.bv_val );
 	}
+
 	e->e_name.bv_len = rlen - 1;
 	e->e_nname.bv_len = nrlen - 1;
-	e->e_name.bv_val = ch_malloc(rlen + nrlen);
-	e->e_nname.bv_val = e->e_name.bv_val + rlen;
+	e->e_name.bv_val = ch_malloc(rlen);
+	e->e_nname.bv_val = ch_malloc(nrlen);
 	ptr = e->e_name.bv_val;
 	nptr = e->e_nname.bv_val;
 	for ( ei = BEI(e); ei && ei->bei_id; ei=ei->bei_parent ) {
@@ -570,6 +583,7 @@ int hdb_fix_dn(
 			*nptr++ = ',';
 		}
 	}
+	BEI(e)->bei_modrdns = max;
 	ptr[-1] = '\0';
 	nptr[-1] = '\0';
 
@@ -581,29 +595,28 @@ int hdb_fix_dn(
  * child's entryID containing the parent's entryID.
  */
 int
-bdb_dn2id_add(
-	BackendDB	*be,
+hdb_dn2id_add(
+	Operation	*op,
 	DB_TXN *txn,
 	EntryInfo	*eip,
-	Entry		*e,
-	void *ctx )
+	Entry		*e )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	DBT		key, data;
 	int		rc, rlen, nrlen;
 	diskNode *d;
 	char *ptr;
 
-	nrlen = dn_rdnlen( be, &e->e_nname );
+	nrlen = dn_rdnlen( op->o_bd, &e->e_nname );
 	if (nrlen) {
-		rlen = dn_rdnlen( be, &e->e_name );
+		rlen = dn_rdnlen( op->o_bd, &e->e_name );
 	} else {
 		nrlen = e->e_nname.bv_len;
 		rlen = e->e_name.bv_len;
 	}
 
-	d = sl_malloc(sizeof(diskNode) + rlen + nrlen, ctx);
+	d = op->o_tmpalloc(sizeof(diskNode) + rlen + nrlen, op->o_tmpmemctx);
 	d->entryID = e->e_id;
 	d->nrdnlen = nrlen;
 	ptr = lutil_strncopy( d->nrdn, e->e_nname.bv_val, nrlen );
@@ -617,6 +630,18 @@ bdb_dn2id_add(
 	key.size = sizeof(ID);
 	key.flags = DB_DBT_USERMEM;
 
+	/* Need to make dummy root node once. Subsequent attempts
+	 * will fail harmlessly.
+	 */
+	if ( eip->bei_id == 0 ) {
+		diskNode dummy = {0};
+		data.data = &dummy;
+		data.size = sizeof(diskNode);
+		data.flags = DB_DBT_USERMEM;
+
+		db->put( db, txn, &key, &data, DB_NODUPDATA );
+	}
+
 #ifdef SLAP_IDL_CACHE
 	if ( bdb->bi_idl_cache_size ) {
 		bdb_idl_cache_del( bdb, db, &key );
@@ -636,20 +661,19 @@ bdb_dn2id_add(
 		rc = db->put( db, txn, &key, &data, DB_NODUPDATA );
 	}
 
-	sl_free( d, ctx );
+	op->o_tmpfree( d, op->o_tmpmemctx );
 
 	return rc;
 }
 
 int
-bdb_dn2id_delete(
-	BackendDB	*be,
+hdb_dn2id_delete(
+	Operation	*op,
 	DB_TXN *txn,
 	EntryInfo	*eip,
-	Entry	*e,
-	void	*ctx )
+	Entry	*e )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	DBT		key, data;
 	DBC	*cursor;
@@ -676,7 +700,7 @@ bdb_dn2id_delete(
 	rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
 	if ( rc ) return rc;
 
-	d = sl_malloc( data.size, ctx );
+	d = op->o_tmpalloc( data.size, op->o_tmpmemctx );
 	d->entryID = e->e_id;
 	d->nrdnlen = BEI(e)->bei_nrdn.bv_len;
 	strcpy( d->nrdn, BEI(e)->bei_nrdn.bv_val );
@@ -693,25 +717,25 @@ bdb_dn2id_delete(
 	 */
 	if ( rc == 0 ) {
 		key.data = &e->e_id;
-		rc = cursor->c_get( cursor, &key, &data, DB_SET );
+		rc = cursor->c_get( cursor, &key, &data, DB_SET | DB_RMW );
 		if ( rc == 0 )
 			rc = cursor->c_del( cursor, 0 );
 	}
 	cursor->c_close( cursor );
-	sl_free( d, ctx );
+	op->o_tmpfree( d, op->o_tmpmemctx );
 
 	return rc;
 }
 
+
 int
-bdb_dn2id(
-	BackendDB	*be,
+hdb_dn2id(
+	Operation	*op,
 	DB_TXN *txn,
 	struct berval	*in,
-	EntryInfo	*ei,
-	void *ctx )
+	EntryInfo	*ei )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	DBT		key, data;
 	DBC	*cursor;
@@ -720,7 +744,7 @@ bdb_dn2id(
 	char	*ptr;
 	ID idp = ei->bei_parent->bei_id;
 
-	nrlen = dn_rdnlen( be, in );
+	nrlen = dn_rdnlen( op->o_bd, in );
 	if (!nrlen) nrlen = in->bv_len;
 
 	DBTzero(&key);
@@ -737,36 +761,42 @@ bdb_dn2id(
 	rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
 	if ( rc ) return rc;
 
-	d = sl_malloc( data.size * 3, ctx );
+	d = op->o_tmpalloc( data.size * 3, op->o_tmpmemctx );
 	d->nrdnlen = nrlen;
 	ptr = lutil_strncopy( d->nrdn, in->bv_val, nrlen );
 	*ptr = '\0';
 	data.data = d;
 
 	rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH );
-	cursor->c_close( cursor );
-
 	if ( rc == 0 ) {
-		AC_MEMCPY( &ei->bei_id, &d->entryID, sizeof(ID) );
+		ei->bei_id = d->entryID;
 		ei->bei_rdn.bv_len = data.size - sizeof(diskNode) - nrlen;
 		ptr = d->nrdn + nrlen + 1;
-		ei->bei_rdn.bv_val = ch_malloc( ei->bei_rdn.bv_len + 1 );
-		strcpy( ei->bei_rdn.bv_val, ptr );
+		ber_str2bv( ptr, ei->bei_rdn.bv_len, 1, &ei->bei_rdn );
+		if ( !ei->bei_parent->bei_dkids ) {
+			db_recno_t dkids;
+			/* How many children does the parent have? */
+			/* FIXME: do we need to lock the parent
+			 * entryinfo? Seems safe...
+			 */
+			cursor->c_count( cursor, &dkids, 0 );
+			ei->bei_parent->bei_dkids = dkids;
+		}
 	}
-	sl_free( d, ctx );
+	cursor->c_close( cursor );
+	op->o_tmpfree( d, op->o_tmpmemctx );
 
 	return rc;
 }
 
 int
-bdb_dn2id_parent(
-	Backend *be,
+hdb_dn2id_parent(
+	Operation *op,
 	DB_TXN *txn,
 	EntryInfo *ei,
-	ID *idp,
-	void *ctx )
+	ID *idp )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	DBT		key, data;
 	DBC	*cursor;
@@ -788,29 +818,34 @@ bdb_dn2id_parent(
 	if ( rc ) return rc;
 
 	data.ulen = sizeof(diskNode) + (SLAP_LDAPDN_MAXLEN * 2);
-	d = sl_malloc( data.ulen, ctx );
+	d = op->o_tmpalloc( data.ulen, op->o_tmpmemctx );
 	data.data = d;
 
 	rc = cursor->c_get( cursor, &key, &data, DB_SET );
-	cursor->c_close( cursor );
 	if ( rc == 0 ) {
 		if (d->nrdnlen >= 0) {
-			return LDAP_OTHER;
+			rc = LDAP_OTHER;
+		} else {
+			db_recno_t dkids;
+			*idp = d->entryID;
+			ei->bei_nrdn.bv_len = 0 - d->nrdnlen;
+			ber_str2bv( d->nrdn, ei->bei_nrdn.bv_len, 1, &ei->bei_nrdn );
+			ei->bei_rdn.bv_len = data.size - sizeof(diskNode) -
+				ei->bei_nrdn.bv_len;
+			ptr = d->nrdn + ei->bei_nrdn.bv_len + 1;
+			ber_str2bv( ptr, ei->bei_rdn.bv_len, 1, &ei->bei_rdn );
+			/* How many children does this node have? */
+			cursor->c_count( cursor, &dkids, 0 );
+			ei->bei_dkids = dkids;
 		}
-		AC_MEMCPY( idp, &d->entryID, sizeof(ID) );
-		ei->bei_nrdn.bv_len = 0 - d->nrdnlen;
-		ber_str2bv( d->nrdn, ei->bei_nrdn.bv_len, 1, &ei->bei_nrdn );
-		ei->bei_rdn.bv_len = data.size - sizeof(diskNode) -
-			ei->bei_nrdn.bv_len;
-		ptr = d->nrdn + ei->bei_nrdn.bv_len + 1;
-		ber_str2bv( ptr, ei->bei_rdn.bv_len, 1, &ei->bei_rdn );
 	}
-	sl_free( d, ctx );
+	cursor->c_close( cursor );
+	op->o_tmpfree( d, op->o_tmpmemctx );
 	return rc;
 }
 
 int
-bdb_dn2id_children(
+hdb_dn2id_children(
 	Operation *op,
 	DB_TXN *txn,
 	Entry *e )
@@ -847,7 +882,12 @@ bdb_dn2id_children(
 
 	rc = cursor->c_get( cursor, &key, &data, DB_SET );
 	if ( rc == 0 ) {
-		rc = cursor->c_get( cursor, &key, &data, DB_NEXT_DUP );
+		db_recno_t dkids;
+		rc = cursor->c_count( cursor, &dkids, 0 );
+		if ( rc == 0 ) {
+			BEI(e)->bei_dkids = dkids;
+			if ( dkids < 2 ) rc = DB_NOTFOUND;
+		}
 	}
 	cursor->c_close( cursor );
 	return rc;
@@ -868,18 +908,33 @@ struct dn2id_cookie {
 	DB *db;
 	int prefix;
 	int rc;
+	EntryInfo *ei;
 	ID id;
 	ID dbuf;
 	ID *ids;
+	void *ptr;
 	ID tmp[BDB_IDL_DB_SIZE];
+	ID *buf;
 	DBT key;
 	DBT data;
 	DBC *dbc;
-	void *ctx;
+	Operation *op;
 };
 
-int
-bdb_dn2idl_internal(
+static int
+apply_func(
+	void *data,
+	void *arg )
+{
+	EntryInfo *ei = data;
+	ID *idl = arg;
+
+	bdb_idl_insert( idl, ei->bei_id );
+	return 0;
+}
+
+static int
+hdb_dn2idl_internal(
 	struct dn2id_cookie *cx
 )
 {
@@ -890,31 +945,102 @@ bdb_dn2idl_internal(
 			return cx->rc;
 		}
 		if ( cx->rc == LDAP_SUCCESS ) {
-			goto saveit;
+			goto gotit;
 		}
 	}
 #endif
-
-	cx->rc = cx->db->cursor( cx->db, NULL, &cx->dbc,
-		cx->bdb->bi_db_opflags );
-	if ( cx->rc ) return cx->rc;
 	BDB_IDL_ZERO( cx->tmp );
 
-	/* The first item holds the parent ID. Ignore it. */
-	cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data, DB_SET );
-	if ( cx->rc == DB_NOTFOUND ) goto saveit;
-	if ( cx->rc ) return cx->rc;
-
-	/* Fetch the rest of the IDs in a loop... */
-	while ( (cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data,
-		DB_NEXT_DUP )) == 0 ) {
-		bdb_idl_insert( cx->tmp, cx->dbuf );
+	if ( !cx->ei ) {
+		cx->ei = bdb_cache_find_info( cx->bdb, cx->id );
+		if ( !cx->ei ) {
+			cx->rc = DB_NOTFOUND;
+			goto saveit;
+		}
 	}
-	cx->dbc->c_close( cx->dbc );
 
-	/* If we got some records, treat as success */
-	if (!BDB_IDL_IS_ZERO(cx->tmp)) {
+	bdb_cache_entryinfo_lock( cx->ei );
+
+	/* If number of kids in the cache differs from on-disk, load
+	 * up all the kids from the database
+	 */
+	if ( cx->ei->bei_ckids+1 != cx->ei->bei_dkids ) {
+		EntryInfo ei;
+		db_recno_t dkids = cx->ei->bei_dkids;
+		ei.bei_parent = cx->ei;
+
+		bdb_cache_entryinfo_unlock( cx->ei );
+
+		cx->rc = cx->db->cursor( cx->db, NULL, &cx->dbc,
+			cx->bdb->bi_db_opflags );
+		if ( cx->rc ) return cx->rc;
+
+		cx->data.data = &cx->dbuf;
+		cx->data.ulen = sizeof(ID);
+		cx->data.dlen = sizeof(ID);
+		cx->data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
+
+		/* The first item holds the parent ID. Ignore it. */
+		cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data, DB_SET );
+		if ( cx->rc ) {
+			cx->dbc->c_close( cx->dbc );
+			if ( cx->rc == DB_NOTFOUND ) goto saveit;
+			return cx->rc;
+		}
+
+		/* If the on-disk count is zero we've never checked it.
+		 * Count it now.
+		 */
+		if ( !dkids ) {
+			cx->dbc->c_count( cx->dbc, &dkids, 0 );
+			cx->ei->bei_dkids = dkids;
+		}
+
+		cx->data.data = cx->buf;
+		cx->data.ulen = BDB_IDL_UM_SIZE * sizeof(ID);
+		cx->data.flags = DB_DBT_USERMEM;
+
+		/* Fetch the rest of the IDs in a loop... */
+		while ( (cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data,
+			DB_MULTIPLE | DB_NEXT_DUP )) == 0 ) {
+			u_int8_t *j;
+			size_t len;
+			DB_MULTIPLE_INIT( cx->ptr, &cx->data );
+			while (cx->ptr) {
+				DB_MULTIPLE_NEXT( cx->ptr, &cx->data, j, len );
+				if (j) {
+					EntryInfo *ei2;
+					diskNode *d = (diskNode *)j;
+					short nrlen;
+
+					AC_MEMCPY( &ei.bei_id, &d->entryID, sizeof(ID) );
+					AC_MEMCPY( &nrlen, &d->nrdnlen, sizeof(d->nrdnlen) );
+					ei.bei_nrdn.bv_len = nrlen;
+					/* nrdn/rdn are set in-place.
+					 * hdb_cache_load will copy them as needed
+					 */
+					ei.bei_nrdn.bv_val = d->nrdn;
+					ei.bei_rdn.bv_len = len - sizeof(diskNode) - ei.bei_nrdn.bv_len;
+					ei.bei_rdn.bv_val = d->nrdn + ei.bei_nrdn.bv_len + 1;
+					bdb_idl_insert( cx->tmp, ei.bei_id );
+					hdb_cache_load( cx->bdb, &ei, &ei2 );
+				}
+			}
+		}
+		cx->rc = cx->dbc->c_close( cx->dbc );
+	} else {
+		/* The in-memory cache is in sync with the on-disk data.
+		 * do we have any kids?
+		 */
 		cx->rc = 0;
+		if ( cx->ei->bei_ckids > 0 ) {
+
+			/* Walk the kids tree; order is irrelevant since bdb_idl_insert
+			 * will insert in sorted order.
+			 */
+			avl_apply( cx->ei->bei_kids, apply_func, cx->tmp, -1, AVL_POSTORDER );
+		}
+		bdb_cache_entryinfo_unlock( cx->ei );
 	}
 
 saveit:
@@ -923,21 +1049,36 @@ saveit:
 		bdb_idl_cache_put( cx->bdb, cx->db, &cx->key, cx->tmp, cx->rc );
 	}
 #endif
-	if ( cx->rc == 0 ) {
+	;
+gotit:
+	if ( !BDB_IDL_IS_ZERO( cx->tmp )) {
 		if ( cx->prefix == DN_SUBTREE_PREFIX ) {
-			ID *save, idcurs;
-
-			save = sl_malloc( BDB_IDL_SIZEOF( cx->tmp ), cx->ctx );
-			BDB_IDL_CPY( save, cx->tmp );
-			bdb_idl_union( cx->ids, cx->tmp );
-	
-			idcurs = 0;
-			for ( cx->id = bdb_idl_first( save, &idcurs );
-				cx->id != NOID;
-				cx->id = bdb_idl_next( save, &idcurs )) {
-				bdb_dn2idl_internal( cx );
+			if (cx->ei->bei_state & CACHE_ENTRY_NO_GRANDKIDS) {
+				bdb_idl_union( cx->ids, cx->tmp );
+			} else {
+				ID *save, idcurs;
+				EntryInfo *ei = cx->ei;
+				int nokids = 1;
+				save = cx->op->o_tmpalloc( BDB_IDL_SIZEOF( cx->tmp ),
+					cx->op->o_tmpmemctx );
+				BDB_IDL_CPY( save, cx->tmp );
+				bdb_idl_union( cx->ids, cx->tmp );
+
+				idcurs = 0;
+				for ( cx->id = bdb_idl_first( save, &idcurs );
+					cx->id != NOID;
+					cx->id = bdb_idl_next( save, &idcurs )) {
+					cx->ei = NULL;
+					hdb_dn2idl_internal( cx );
+					if ( !BDB_IDL_IS_ZERO( cx->tmp ))
+						nokids = 0;
+				}
+				cx->op->o_tmpfree( save, cx->op->o_tmpmemctx );
+				if ( nokids ) ei->bei_state |= CACHE_ENTRY_NO_GRANDKIDS;
 			}
-			sl_free( save, cx->ctx );
+			/* Make sure caller knows it had kids! */
+			cx->tmp[0]=1;
+
 			cx->rc = 0;
 		} else {
 			BDB_IDL_CPY( cx->ids, cx->tmp );
@@ -947,25 +1088,43 @@ saveit:
 }
 
 int
-bdb_dn2idl(
-	BackendDB	*be,
-	struct berval	*dn,
-	int prefix,
+hdb_dn2idl(
+	Operation	*op,
+	Entry		*e,
 	ID *ids,
-	void *ctx )
+	ID *stack )
 {
+	struct bdb_info *bdb = (struct bdb_info *)op->o_bd->be_private;
 	struct dn2id_cookie cx;
 
-	cx.id = *(ID *)dn;
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, ARGS, 
+		"=> hdb_dn2ididl( \"%s\" )\n", e->e_nname.bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2idl( \"%s\" )\n", e->e_nname.bv_val, 0, 0 );
+#endif
+
+#ifndef BDB_MULTIPLE_SUFFIXES
+	if ( op->ors_scope != LDAP_SCOPE_ONELEVEL && 
+		BEI(e)->bei_parent->bei_id == 0 )
+	{
+		BDB_IDL_ALL( bdb, ids );
+		return 0;
+	}
+#endif
 
-	cx.bdb = (struct bdb_info *)be->be_private;
+	cx.id = e->e_id;
+	cx.ei = e->e_id ? BEI(e) : &bdb->bi_cache.c_dntree;
+	cx.bdb = bdb;
 	cx.db = cx.bdb->bi_dn2id->bdi_db;
-	cx.prefix = prefix;
+	cx.prefix = op->ors_scope == LDAP_SCOPE_ONELEVEL
+		? DN_ONE_PREFIX : DN_SUBTREE_PREFIX;
 	cx.ids = ids;
-	cx.ctx = ctx;
+	cx.buf = stack;
+	cx.op = op;
 
 	BDB_IDL_ZERO( ids );
-	if ( prefix == DN_SUBTREE_PREFIX ) {
+	if ( cx.prefix == DN_SUBTREE_PREFIX ) {
 		bdb_idl_insert( ids, cx.id );
 	}
 
@@ -976,11 +1135,7 @@ bdb_dn2idl(
 	cx.key.flags = DB_DBT_USERMEM;
 
 	DBTzero(&cx.data);
-	cx.data.data = &cx.dbuf;
-	cx.data.ulen = sizeof(ID);
-	cx.data.dlen = sizeof(ID);
-	cx.data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
 
-	return bdb_dn2idl_internal(&cx);
+	return hdb_dn2idl_internal(&cx);
 }
 #endif	/* BDB_HIER */