]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/dn2id.c
More for 2.2beta
[openldap] / servers / slapd / back-bdb / dn2id.c
index 1021446c93e272047fda6cf50f8c35ce0e12bc62..c3cef02e80d30311594fbb1952be28f90e7887e1 100644 (file)
@@ -1,7 +1,7 @@
 /* dn2id.c - routines to deal with the dn2id index */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 
 #include "back-bdb.h"
 #include "idl.h"
+#include "lutil.h"
 
+#ifndef BDB_HIER
 int
 bdb_dn2id_add(
-       BackendDB       *be,
+       Operation *op,
        DB_TXN *txn,
-       const char      *pdn,
+       EntryInfo *eip,
        Entry           *e )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       DB *db = bdb->bi_dn2id->bdi_db;
        int             rc;
        DBT             key, data;
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       DB *db = bdb->bi_dn2id->bdi_db;
+       char            *buf;
+       struct berval   ptr, pdn;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n",
+               e->e_ndn, (long) e->e_id, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n",
                e->e_ndn, (long) e->e_id, 0 );
+#endif
        assert( e->e_id != NOID );
 
        DBTzero( &key );
-       key.size = strlen( e->e_ndn ) + 2;
-       key.data = ch_malloc( key.size );
-       ((char *)key.data)[0] = DN_BASE_PREFIX;
-       AC_MEMCPY( &((char *)key.data)[1], e->e_ndn, key.size - 1 );
+       key.size = e->e_nname.bv_len + 2;
+       key.ulen = key.size;
+       key.flags = DB_DBT_USERMEM;
+       buf = op->o_tmpalloc( key.size, op->o_tmpmemctx );
+       key.data = buf;
+       buf[0] = DN_BASE_PREFIX;
+       ptr.bv_val = buf + 1;
+       ptr.bv_len = e->e_nname.bv_len;
+       AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+       ptr.bv_val[ptr.bv_len] = '\0';
 
        DBTzero( &data );
        data.data = (char *) &e->e_id;
@@ -42,169 +57,268 @@ bdb_dn2id_add(
        /* store it -- don't override */
        rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( INDEX, ERR, "bdb_dn2id_add: put failed: %s %d\n",
+                       db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: put failed: %s %d\n",
                        db_strerror(rc), rc, 0 );
+#endif
                goto done;
        }
 
-       {
-               ((char *)(key.data))[0] = DN_ONE_PREFIX;
-
-               if( pdn != NULL ) {
-                       key.size = strlen( pdn ) + 2;
-                       AC_MEMCPY( &((char*)key.data)[1],
-                               pdn, key.size - 1 );
-
-                       rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
-
-                       if( rc != 0 ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
-                                       pdn, rc, 0 );
-                               goto done;
-                       }
+#ifndef BDB_MULTIPLE_SUFFIXES
+       if( !be_issuffix( op->o_bd, &ptr )) {
+#endif
+               buf[0] = DN_SUBTREE_PREFIX;
+               rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
+               if( rc != 0 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( INDEX, ERR, 
+                               "=> bdb_dn2id_add: subtree (%s) put failed: %d\n",
+                               ptr.bv_val, rc, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_dn2id_add: subtree (%s) put failed: %d\n",
+                       ptr.bv_val, rc, 0 );
+#endif
+                       goto done;
                }
+               
+#ifdef BDB_MULTIPLE_SUFFIXES
+       if( !be_issuffix( op->o_bd, &ptr )) {
+#endif
+               dnParent( &ptr, &pdn );
+       
+               key.size = pdn.bv_len + 2;
+               key.ulen = key.size;
+               pdn.bv_val[-1] = DN_ONE_PREFIX;
+               key.data = pdn.bv_val-1;
+               ptr = pdn;
+
+               rc = bdb_idl_insert_key( op->o_bd, db, txn, &key, e->e_id );
+
+               if( rc != 0 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( INDEX, ERR, 
+                               "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
+                               ptr.bv_val, rc, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                               "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
+                                       ptr.bv_val, rc, 0 );
+#endif
+                       goto done;
+               }
+#ifndef BDB_MULTIPLE_SUFFIXES
        }
 
-       {
-               char **subtree = dn_subtree( be, e->e_ndn );
-
-               if( subtree != NULL ) {
-                       int i;
-                       ((char *)key.data)[0] = DN_SUBTREE_PREFIX;
-                       for( i=0; subtree[i] != NULL; i++ ) {
-                               if (be_issuffix(be, subtree[i]))
-                                       continue;
-                               key.size = strlen( subtree[i] ) + 2;
-                               AC_MEMCPY( &((char *)key.data)[1],
-                                       subtree[i], key.size - 1 );
-
-                               rc = bdb_idl_insert_key( be, db, txn, &key,
-                                       e->e_id );
-
-                               if( rc != 0 ) {
-                                       Debug( LDAP_DEBUG_ANY,
-                                               "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-                                               subtree[i], rc, 0 );
-                                       break;
-                               }
-                       }
+       while( !be_issuffix( op->o_bd, &ptr )) {
+#else
+       for (;;) {
+#endif
+               ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
+
+               rc = bdb_idl_insert_key( op->o_bd, db, txn, &key, e->e_id );
 
-                       charray_free( subtree );
+               if( rc != 0 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( INDEX, ERR, 
+                               "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
+                               ptr.bv_val, rc, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                               "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
+                                       ptr.bv_val, rc, 0 );
+#endif
+                       break;
                }
+#ifdef BDB_MULTIPLE_SUFFIXES
+               if( be_issuffix( op->o_bd, &ptr )) break;
+#endif
+               dnParent( &ptr, &pdn );
+
+               key.size = pdn.bv_len + 2;
+               key.ulen = key.size;
+               key.data = pdn.bv_val - 1;
+               ptr = pdn;
        }
+#ifdef BDB_MULTIPLE_SUFFIXES
+       }
+#endif
 
 done:
-       ch_free( key.data );
+       op->o_tmpfree( buf, op->o_tmpmemctx );
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
+#endif
        return rc;
 }
 
 int
 bdb_dn2id_delete(
-       BackendDB       *be,
+       Operation *op,
        DB_TXN *txn,
-       const char      *pdn,
-       const char      *dn,
-       ID              id )
+       EntryInfo       *eip,
+       Entry           *e )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       DB *db = bdb->bi_dn2id->bdi_db;
        int             rc;
        DBT             key;
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       DB *db = bdb->bi_dn2id->bdi_db;
+       char            *buf;
+       struct berval   pdn, ptr;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, ARGS, 
+               "=> bdb_dn2id_delete ( \"%s\", 0x%08lx )\n", e->e_ndn, e->e_id, 0);
+#else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
-               dn, id, 0 );
+               e->e_ndn, e->e_id, 0 );
+#endif
 
        DBTzero( &key );
-       key.size = strlen( dn ) + 2;
-       key.data = ch_malloc( key.size );
+       key.size = e->e_nname.bv_len + 2;
+       buf = op->o_tmpalloc( key.size, op->o_tmpmemctx );
+       key.data = buf;
        key.flags = DB_DBT_USERMEM;
-       ((char *)key.data)[0] = DN_BASE_PREFIX;
-       AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+       buf[0] = DN_BASE_PREFIX;
+       ptr.bv_val = buf+1;
+       ptr.bv_len = e->e_nname.bv_len;
+       AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+       ptr.bv_val[ptr.bv_len] = '\0';
 
        /* delete it */
        rc = db->del( db, txn, &key, 0 );
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( INDEX, ERR, 
+                       "=> bdb_dn2id_delete: delete failed: %s %d\n", 
+                       db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n",
                        db_strerror(rc), rc, 0 );
+#endif
                goto done;
        }
 
-       {
-               ((char *)(key.data))[0] = DN_ONE_PREFIX;
-
-               if( pdn != NULL ) {
-                       key.size = strlen( pdn ) + 2;
-                       AC_MEMCPY( &((char*)key.data)[1],
-                               pdn, key.size - 1 );
-
-                       rc = bdb_idl_delete_key( be, db, txn, &key, id );
+#ifndef BDB_MULTIPLE_SUFFIXES
+       if( !be_issuffix( op->o_bd, &ptr )) {
+#endif
+               buf[0] = DN_SUBTREE_PREFIX;
+               rc = db->del( db, txn, &key, 0 );
+               if( rc != 0 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( INDEX, ERR, 
+                               "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", 
+                               ptr.bv_val, rc, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
+                       ptr.bv_val, rc, 0 );
+#endif
+                       goto done;
+               }
 
-                       if( rc != 0 ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
-                                       pdn, rc, 0 );
-                               goto done;
-                       }
+#ifdef BDB_MULTIPLE_SUFFIXES
+       if( !be_issuffix( op->o_bd, &ptr )) {
+#endif
+               dnParent( &ptr, &pdn );
+
+               key.size = pdn.bv_len + 2;
+               key.ulen = key.size;
+               pdn.bv_val[-1] = DN_ONE_PREFIX;
+               key.data = pdn.bv_val - 1;
+               ptr = pdn;
+
+               rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
+
+               if( rc != 0 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( INDEX, ERR, 
+                               "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n", 
+                               ptr.bv_val, rc, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                               "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
+                               ptr.bv_val, rc, 0 );
+#endif
+                       goto done;
                }
+#ifndef BDB_MULTIPLE_SUFFIXES
        }
 
-       {
-               char **subtree = dn_subtree( be, dn );
-
-               if( subtree != NULL ) {
-                       int i;
-                       ((char *)key.data)[0] = DN_SUBTREE_PREFIX;
-                       for( i=0; subtree[i] != NULL; i++ ) {
-                               key.size = strlen( subtree[i] ) + 2;
-                               AC_MEMCPY( &((char *)key.data)[1],
-                                       subtree[i], key.size - 1 );
-
-                               rc = bdb_idl_delete_key( be, db, txn, &key, id );
-
-                               if( rc != 0 ) {
-                                       Debug( LDAP_DEBUG_ANY,
-                                               "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
-                                               subtree[i], rc, 0 );
-                                       charray_free( subtree );
-                                       goto done;
-                               }
-                       }
-
-                       charray_free( subtree );
+       while( !be_issuffix( op->o_bd, &ptr )) {
+#else
+       for (;;) {
+#endif
+               ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
+
+               rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
+               if( rc != 0 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( INDEX, ERR, 
+                               "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n", 
+                               ptr.bv_val, rc, 0 );
+#else
+                       Debug( LDAP_DEBUG_ANY,
+                               "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
+                               ptr.bv_val, rc, 0 );
+#endif
+                       goto done;
                }
+#ifdef BDB_MULTIPLE_SUFFIXES
+               if( be_issuffix( op->o_bd, &ptr )) break;
+#endif
+               dnParent( &ptr, &pdn );
+
+               key.size = pdn.bv_len + 2;
+               key.ulen = key.size;
+               key.data = pdn.bv_val - 1;
+               ptr = pdn;
+       }
+#ifdef BDB_MULTIPLE_SUFFIXES
        }
+#endif
 
 done:
-       ch_free( key.data );
+       op->o_tmpfree( buf, op->o_tmpmemctx );
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
+#endif
        return rc;
 }
 
 int
 bdb_dn2id(
-       BackendDB       *be,
+       Operation *op,
        DB_TXN *txn,
-       const char      *dn,
-       ID *id )
+       struct berval   *dn,
+       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;
 
-       Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn, 0, 0 );
-
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, ARGS, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
+#else
+       Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
+#endif
        DBTzero( &key );
-       key.size = strlen( dn ) + 2;
-       key.data = ch_malloc( key.size );
+       key.size = dn->bv_len + 2;
+       key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
        ((char *)key.data)[0] = DN_BASE_PREFIX;
-       AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
+       AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
 
        /* store the ID */
        DBTzero( &data );
-       data.data = id;
+       data.data = &ei->bei_id;
        data.ulen = sizeof(ID);
        data.flags = DB_DBT_USERMEM;
 
@@ -212,124 +326,61 @@ bdb_dn2id(
        rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
 
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( INDEX, ERR, "<= bdb_dn2id: get failed %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n",
                        db_strerror( rc ), rc, 0 );
+#endif
        } else {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_dn2id: got id=0x%08lx\n", ei->bei_id, 0, 0 );
+#else
                Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%08lx\n",
-                       *id, 0, 0 );
-       }
-
-       ch_free( key.data );
-       return rc;
-}
-
-int
-bdb_dn2id_matched(
-       BackendDB       *be,
-       DB_TXN *txn,
-       const char      *in,
-       ID *id,
-       char **matchedDN )
-{
-       int             rc;
-       DBT             key, data;
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       DB *db = bdb->bi_dn2id->bdi_db;
-       const char *dn = in;
-       char *tmp = NULL;
-
-       Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", dn, 0, 0 );
-
-       DBTzero( &key );
-       key.size = strlen( dn ) + 2;
-       key.data = ch_malloc( key.size );
-       ((char *)key.data)[0] = DN_BASE_PREFIX;
-
-       /* store the ID */
-       DBTzero( &data );
-       data.data = id;
-       data.ulen = sizeof(ID);
-       data.flags = DB_DBT_USERMEM;
-
-       *matchedDN = NULL;
-
-       while(1) {
-               AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
-
-               *id = NOID;
-
-               /* fetch it */
-               rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
-
-               if( rc == DB_NOTFOUND ) {
-                       char *pdn = dn_parent( be, dn );
-                       ch_free( tmp );
-                       tmp = NULL;
-
-                       if( pdn == NULL || *pdn == '\0' ) {
-                               Debug( LDAP_DEBUG_TRACE,
-                                       "<= bdb_dn2id_matched: no match\n",
-                                       0, 0, 0 );
-                               ch_free( pdn );
-                               break;
-                       }
-
-                       dn = pdn;
-                       tmp = pdn;
-                       key.size = strlen( dn ) + 2;
-
-               } else if ( rc == 0 ) {
-                       if( data.size != sizeof( ID ) ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       "<= bdb_dn2id_matched: get size mismatch: "
-                                       "expected %ld, got %ld\n",
-                                       (long) sizeof(ID), (long) data.size, 0 );
-                               ch_free( tmp );
-                       }
-
-                       if( in != dn ) {
-                               *matchedDN = (char *) dn;
-                       }
-
-                       Debug( LDAP_DEBUG_TRACE,
-                               "<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
-                               (long) *id, *matchedDN == NULL ? "entry" : "matched", dn );
-                       break;
-
-               } else {
-                       Debug( LDAP_DEBUG_ANY,
-                               "<= bdb_dn2id_matched: get failed: %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-                       ch_free( tmp );
-                       break;
-               }
+                       ei->bei_id, 0, 0 );
+#endif
        }
 
-       ch_free( key.data );
+       op->o_tmpfree( key.data, op->o_tmpmemctx );
        return rc;
 }
 
 int
 bdb_dn2id_children(
-       BackendDB       *be,
+       Operation *op,
        DB_TXN *txn,
-       const char *dn )
+       Entry *e )
 {
-       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;
        ID              id;
+       int             rc;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, ARGS, 
+               "=> bdb_dn2id_children( %s )\n", e->e_nname.bv_val, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children( %s )\n",
-               dn, 0, 0 );
-
+               e->e_nname.bv_val, 0, 0 );
+#endif
        DBTzero( &key );
-       key.size = strlen( dn ) + 2;
-       key.data = ch_malloc( key.size );
+       key.size = e->e_nname.bv_len + 2;
+       key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
        ((char *)key.data)[0] = DN_ONE_PREFIX;
-       AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
-
+       AC_MEMCPY( &((char *)key.data)[1], e->e_nname.bv_val, key.size - 1 );
+
+#ifdef SLAP_IDL_CACHE
+       if ( bdb->bi_idl_cache_size ) {
+               rc = bdb_idl_cache_get( bdb, db, &key, NULL );
+               if ( rc != LDAP_NO_SUCH_OBJECT ) {
+                       op->o_tmpfree( key.data, op->o_tmpmemctx );
+                       return rc;
+               }
+       }
+#endif
        /* we actually could do a empty get... */
        DBTzero( &data );
        data.data = &id;
@@ -339,55 +390,731 @@ bdb_dn2id_children(
        data.dlen = sizeof(id);
 
        rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
-
-       Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n",
-               dn,
+       op->o_tmpfree( key.data, op->o_tmpmemctx );
+
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, DETAIL1, 
+               "<= bdb_dn2id_children( %s ): %s (%d)\n", 
+               e->e_nname.bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
+               db_strerror(rc)), rc );
+#else
+       Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %s (%d)\n",
+               e->e_nname.bv_val,
                rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
                        db_strerror(rc) ), rc );
+#endif
 
        return rc;
 }
 
 int
 bdb_dn2idl(
-       BackendDB       *be,
-       const char      *dn,
-       int prefix,
-       ID *ids )
+       Operation *op,
+       Entry *e,
+       ID *ids,
+       ID *stack )
 {
        int             rc;
-       DBT             key, data;
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       DBT             key;
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        DB *db = bdb->bi_dn2id->bdi_db;
-
-       Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn, 0, 0 );
-
-       if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn))
+       int prefix = op->ors_scope == LDAP_SCOPE_SUBTREE ? DN_SUBTREE_PREFIX :
+                       DN_ONE_PREFIX;
+
+#ifdef NEW_LOGGING
+       LDAP_LOG ( INDEX, ARGS, 
+               "=> bdb_dn2ididl( \"%s\" )\n", e->e_nname.bv_val, 0, 0 );
+#else
+       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 && BEI(e)->bei_parent->bei_id == 0 )
        {
                BDB_IDL_ALL(bdb, ids);
                return 0;
        }
+#endif
 
        DBTzero( &key );
-       key.size = strlen( dn ) + 2;
-       key.data = ch_malloc( key.size );
+       key.size = e->e_nname.bv_len + 2;
+       key.ulen = key.size;
+       key.flags = DB_DBT_USERMEM;
+       key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
        ((char *)key.data)[0] = prefix;
-       AC_MEMCPY( &((char *)key.data)[1], dn, 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
+               LDAP_LOG ( INDEX, ERR, 
+                       "<= bdb_dn2ididl: get failed: %s (%d)\n", db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_dn2idl: get failed: %s (%d)\n",
                        db_strerror( rc ), rc, 0 );
+#endif
 
        } else {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( INDEX, RESULTS, 
+                       "<= bdb_dn2ididl: id=%ld first=%ld last=%ld\n", 
+                       (long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+                       (long) BDB_IDL_LAST( ids ) );
+#else
                Debug( LDAP_DEBUG_TRACE,
                        "<= bdb_dn2idl: id=%ld first=%ld last=%ld\n",
                        (long) ids[0],
                        (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) );
+#endif
        }
 
-       ch_free( key.data );
+       op->o_tmpfree( key.data, op->o_tmpmemctx );
        return rc;
 }
+#else  /* BDB_HIER */
+
+/* Experimental management routines for a hierarchically structured database.
+ *
+ * Unsupported! Use at your own risk!
+ * -- Howard Chu, Symas Corp. 2003.
+ *
+ * Instead of a ldbm-style dn2id database, we use a hierarchical one. Each
+ * entry in this database is a struct diskNode, keyed by entryID and with
+ * the data containing the RDN and entryID of the node's children. We use
+ * a B-Tree with sorted duplicates to store all the children of a node under
+ * the same key. Also, the first item under the key contains the entry's own
+ * rdn and the ID of the node's parent, to allow bottom-up tree traversal as
+ * well as top-down. To keep this info first in the list, the nrdnlen is set
+ * to the negative of its value.
+ *
+ * The diskNode is a variable length structure. This definition is not
+ * directly usable for in-memory manipulation.
+ */
+typedef struct diskNode {
+       ID entryID;
+       short nrdnlen;
+       char nrdn[1];
+       char rdn[1];
+} diskNode;
+
+/* Sort function for the sorted duplicate data items of a dn2id key.
+ * Sorts based on normalized RDN, in length order.
+ */
+int
+hdb_dup_compare(
+       DB *db, 
+       const DBT *usrkey,
+       const DBT *curkey
+)
+{
+       char *u = (char *)&(((diskNode *)(usrkey->data))->nrdnlen);
+       char *c = (char *)&(((diskNode *)(curkey->data))->nrdnlen);
+       int rc, i;
+
+       /* 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;
+       }
+       return strcmp( u+sizeof(short), c+sizeof(short) );
+}
+
+/* This function constructs a full DN for a given entry.
+ */
+int hdb_fix_dn(
+       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);
+       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 ) {
+               ptr = lutil_strcopy(ptr, ei->bei_rdn.bv_val);
+               nptr = lutil_strcopy(nptr, ei->bei_nrdn.bv_val);
+               if ( ei->bei_parent ) {
+                       *ptr++ = ',';
+                       *nptr++ = ',';
+               }
+       }
+       BEI(e)->bei_modrdns = max;
+       ptr[-1] = '\0';
+       nptr[-1] = '\0';
+
+       return 0;
+}
+
+/* We add two elements to the DN2ID database - a data item under the parent's
+ * entryID containing the child's RDN and entryID, and an item under the
+ * child's entryID containing the parent's entryID.
+ */
+int
+hdb_dn2id_add(
+       Operation       *op,
+       DB_TXN *txn,
+       EntryInfo       *eip,
+       Entry           *e )
+{
+       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( op->o_bd, &e->e_nname );
+       if (nrlen) {
+               rlen = dn_rdnlen( op->o_bd, &e->e_name );
+       } else {
+               nrlen = e->e_nname.bv_len;
+               rlen = e->e_name.bv_len;
+       }
+
+       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 );
+       *ptr++ = '\0';
+       ptr = lutil_strncopy( ptr, e->e_name.bv_val, rlen );
+       *ptr = '\0';
+
+       DBTzero(&key);
+       DBTzero(&data);
+       key.data = &eip->bei_id;
+       key.size = sizeof(ID);
+       key.flags = DB_DBT_USERMEM;
+
+#ifdef SLAP_IDL_CACHE
+       if ( bdb->bi_idl_cache_size ) {
+               bdb_idl_cache_del( bdb, db, &key );
+       }
+#endif
+       data.data = d;
+       data.size = sizeof(diskNode) + rlen + nrlen;
+       data.flags = DB_DBT_USERMEM;
+
+       rc = db->put( db, txn, &key, &data, DB_NODUPDATA );
+
+       if (rc == 0) {
+               key.data = &e->e_id;
+               d->entryID = eip->bei_id;
+               d->nrdnlen = 0 - nrlen;
+
+               rc = db->put( db, txn, &key, &data, DB_NODUPDATA );
+       }
+
+       op->o_tmpfree( d, op->o_tmpmemctx );
+
+       return rc;
+}
+
+int
+hdb_dn2id_delete(
+       Operation       *op,
+       DB_TXN *txn,
+       EntryInfo       *eip,
+       Entry   *e )
+{
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       DB *db = bdb->bi_dn2id->bdi_db;
+       DBT             key, data;
+       DBC     *cursor;
+       diskNode *d;
+       int rc, nrlen;
+
+       DBTzero(&key);
+       key.size = sizeof(ID);
+       key.ulen = key.size;
+       key.data = &eip->bei_id;
+       key.flags = DB_DBT_USERMEM;
+
+       DBTzero(&data);
+       data.size = sizeof(diskNode) + BEI(e)->bei_nrdn.bv_len;
+       data.ulen = data.size;
+       data.dlen = data.size;
+       data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
+
+#ifdef SLAP_IDL_CACHE
+       if ( bdb->bi_idl_cache_size ) {
+               bdb_idl_cache_del( bdb, db, &key );
+       }
+#endif
+       rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
+       if ( rc ) return rc;
+
+       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 );
+       data.data = d;
+
+       /* Delete our ID from the parent's list */
+       rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH | DB_RMW );
+       if ( rc == 0 )
+               rc = cursor->c_del( cursor, 0 );
+
+       /* Delete our ID from the tree. With sorted duplicates, this
+        * will leave any child nodes still hanging around. This is OK
+        * for modrdn, which will add our info back in later.
+        */
+       if ( rc == 0 ) {
+               key.data = &e->e_id;
+               rc = cursor->c_get( cursor, &key, &data, DB_SET | DB_RMW );
+               if ( rc == 0 )
+                       rc = cursor->c_del( cursor, 0 );
+       }
+       cursor->c_close( cursor );
+       op->o_tmpfree( d, op->o_tmpmemctx );
+
+       return rc;
+}
+
+
+int
+hdb_dn2id(
+       Operation       *op,
+       DB_TXN *txn,
+       struct berval   *in,
+       EntryInfo       *ei )
+{
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       DB *db = bdb->bi_dn2id->bdi_db;
+       DBT             key, data;
+       DBC     *cursor;
+       int             rc = 0, nrlen;
+       diskNode *d;
+       char    *ptr;
+       ID idp = ei->bei_parent->bei_id;
+
+       nrlen = dn_rdnlen( op->o_bd, in );
+       if (!nrlen) nrlen = in->bv_len;
+
+       DBTzero(&key);
+       key.size = sizeof(ID);
+       key.data = &idp;
+       key.ulen = sizeof(ID);
+       key.flags = DB_DBT_USERMEM;
+
+       DBTzero(&data);
+       data.size = sizeof(diskNode) + nrlen;
+       data.ulen = data.size * 3;
+       data.flags = DB_DBT_USERMEM;
+
+       rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
+       if ( rc ) return rc;
+
+       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 );
+       if ( rc == 0 ) {
+               ei->bei_id = d->entryID;
+               ei->bei_rdn.bv_len = data.size - sizeof(diskNode) - nrlen;
+               ptr = d->nrdn + nrlen + 1;
+               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;
+               }
+       }
+       cursor->c_close( cursor );
+       op->o_tmpfree( d, op->o_tmpmemctx );
+
+       return rc;
+}
+
+int
+hdb_dn2id_parent(
+       Operation *op,
+       DB_TXN *txn,
+       EntryInfo *ei,
+       ID *idp )
+{
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       DB *db = bdb->bi_dn2id->bdi_db;
+       DBT             key, data;
+       DBC     *cursor;
+       int             rc = 0;
+       diskNode *d;
+       char    *ptr;
+       unsigned char *pt2;
+
+       DBTzero(&key);
+       key.size = sizeof(ID);
+       key.data = &ei->bei_id;
+       key.ulen = sizeof(ID);
+       key.flags = DB_DBT_USERMEM;
+
+       DBTzero(&data);
+       data.flags = DB_DBT_USERMEM;
+
+       rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
+       if ( rc ) return rc;
+
+       data.ulen = sizeof(diskNode) + (SLAP_LDAPDN_MAXLEN * 2);
+       d = op->o_tmpalloc( data.ulen, op->o_tmpmemctx );
+       data.data = d;
+
+       rc = cursor->c_get( cursor, &key, &data, DB_SET );
+       if ( rc == 0 ) {
+               if (d->nrdnlen >= 0) {
+                       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;
+               }
+       }
+       cursor->c_close( cursor );
+       op->o_tmpfree( d, op->o_tmpmemctx );
+       return rc;
+}
+
+int
+hdb_dn2id_children(
+       Operation *op,
+       DB_TXN *txn,
+       Entry *e )
+{
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       DB *db = bdb->bi_dn2id->bdi_db;
+       DBT             key, data;
+       DBC             *cursor;
+       int             rc;
+       ID              id;
+       diskNode d;
+
+       DBTzero(&key);
+       key.size = sizeof(ID);
+       key.data = &e->e_id;
+       key.flags = DB_DBT_USERMEM;
+
+#ifdef SLAP_IDL_CACHE
+       if ( bdb->bi_idl_cache_size ) {
+               rc = bdb_idl_cache_get( bdb, db, &key, NULL );
+               if ( rc != LDAP_NO_SUCH_OBJECT ) {
+                       return rc;
+               }
+       }
+#endif
+       DBTzero(&data);
+       data.data = &d;
+       data.ulen = sizeof(d);
+       data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
+       data.dlen = sizeof(d);
+
+       rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
+       if ( rc ) return rc;
+
+       rc = cursor->c_get( cursor, &key, &data, DB_SET );
+       if ( rc == 0 ) {
+               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;
+}
+
+/* bdb_dn2idl:
+ * We can't just use bdb_idl_fetch_key because
+ * 1 - our data items are longer than just an entry ID
+ * 2 - our data items are sorted alphabetically by nrdn, not by ID.
+ *
+ * We descend the tree recursively, so we define this cookie
+ * to hold our necessary state information. The bdb_dn2idl_internal
+ * function uses this cookie when calling itself.
+ */
+
+struct dn2id_cookie {
+       struct bdb_info *bdb;
+       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;
+       Operation *op;
+};
+
+/* Stuff for iterating over a bei_kids AVL tree and adding the
+ * IDs to an IDL
+ */
+struct apply_arg {
+       ID *idl;
+       EntryInfo **ei;
+};
+
+static int
+apply_func(
+       void *data,
+       void *arg )
+{
+       EntryInfo *ei = data;
+       struct apply_arg *ap = arg;
+
+       bdb_idl_insert( ap->idl, ei->bei_id );
+       if ( ap->ei ) {
+               *(ap->ei)++ = ei;
+       }
+       return 0;
+}
+
+static int
+hdb_dn2idl_internal(
+       struct dn2id_cookie *cx
+)
+{
+       EntryInfo **eilist = NULL, **ptr;
+#ifdef SLAP_IDL_CACHE
+       if ( cx->bdb->bi_idl_cache_size ) {
+               cx->rc = bdb_idl_cache_get(cx->bdb, cx->db, &cx->key, cx->tmp);
+               if ( cx->rc == DB_NOTFOUND ) {
+                       return cx->rc;
+               }
+               if ( cx->rc == LDAP_SUCCESS ) {
+                       goto gotit;
+               }
+       }
+#endif
+       BDB_IDL_ZERO( cx->tmp );
+
+       /* 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;
+               ei.bei_parent = 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 == DB_NOTFOUND ) goto saveit;
+               if ( cx->rc ) return cx->rc;
+
+               /* If the on-disk count is zero we've never checked it.
+                * Count it now.
+                */
+               if ( !cx->ei->bei_dkids ) {
+                       db_recno_t dkids;
+                       cx->dbc->c_count( cx->dbc, &dkids, 0 );
+                       cx->ei->bei_dkids = dkids;
+               }
+
+               /* If there are kids and this is a subtree search, allocate
+                * temp storage for the list of kids.
+                */
+               if ( cx->prefix == DN_SUBTREE_PREFIX && cx->ei->bei_dkids > 1 ) {
+                       eilist = cx->op->o_tmpalloc( sizeof(EntryInfo *) * cx->ei->bei_dkids, cx->op->o_tmpmemctx );
+                       eilist[cx->ei->bei_dkids-1] = NULL;
+                       ptr = eilist;
+               }
+
+               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;
+
+                                       AC_MEMCPY( &ei.bei_id, &d->entryID, sizeof(ID) );
+                                       AC_MEMCPY( &ei.bei_nrdn.bv_len, &d->nrdnlen, sizeof(d->nrdnlen) );
+                                       /* 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 );
+                                       if ( eilist )
+                                               *ptr++ = ei2;
+                               }
+                       }
+               }
+               cx->dbc->c_close( cx->dbc );
+       } else {
+               /* The in-memory cache is in sync with the on-disk data.
+                * do we have any kids?
+                */
+               if ( cx->ei->bei_ckids > 0 ) {
+                       struct apply_arg ap;
+
+                       /* Temp storage for subtree search */
+                       if ( cx->prefix == DN_SUBTREE_PREFIX ) {
+                               eilist = cx->op->o_tmpalloc( sizeof(EntryInfo *) * cx->ei->bei_dkids, cx->op->o_tmpmemctx );
+                               eilist[cx->ei->bei_dkids-1] = NULL;
+                       }
+
+                       /* Walk the kids tree; order is irrelevant since bdb_idl_insert
+                        * will insert in sorted order.
+                        */
+                       ap.idl = cx->tmp;
+                       ap.ei = eilist;
+                       bdb_cache_entryinfo_lock( cx->ei );
+                       avl_apply( cx->ei->bei_kids, apply_func, &ap, -1, AVL_POSTORDER );
+                       bdb_cache_entryinfo_unlock( cx->ei );
+               }
+       }
+
+       /* If we got some records, treat as success */
+       if (!BDB_IDL_IS_ZERO(cx->tmp)) {
+               cx->rc = 0;
+       }
+
+saveit:
+#ifdef SLAP_IDL_CACHE
+       if ( cx->bdb->bi_idl_cache_max_size ) {
+               bdb_idl_cache_put( cx->bdb, cx->db, &cx->key, cx->tmp, cx->rc );
+       }
+#endif
+       ;
+gotit:
+       if ( cx->rc == 0 ) {
+               /* If eilist is NULL, cx->tmp is empty... */
+               if ( cx->prefix == DN_SUBTREE_PREFIX && eilist ) {
+                       bdb_idl_union( cx->ids, cx->tmp );
+                       for (ptr = eilist; *ptr; ptr++) {
+                               cx->ei = *ptr;
+                               cx->id = cx->ei->bei_id;
+                               hdb_dn2idl_internal( cx );
+                       }
+                       cx->op->o_tmpfree( eilist, cx->op->o_tmpmemctx );
+                       cx->rc = 0;
+               } else {
+                       BDB_IDL_CPY( cx->ids, cx->tmp );
+               }
+       }
+       return cx->rc;
+}
+
+int
+hdb_dn2idl(
+       Operation       *op,
+       Entry           *e,
+       ID *ids,
+       ID *stack )
+{
+       struct bdb_info *bdb = (struct bdb_info *)op->o_bd->be_private;
+       struct dn2id_cookie cx;
+
+#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_SUBTREE && 
+               BEI(e)->bei_parent->bei_id == 0 ) {
+               BDB_IDL_ALL( bdb, ids );
+               return 0;
+       }
+#endif
+
+       cx.id = e->e_id;
+       cx.ei = BEI(e);
+       cx.bdb = bdb;
+       cx.db = cx.bdb->bi_dn2id->bdi_db;
+       cx.prefix = op->ors_scope == LDAP_SCOPE_SUBTREE ? DN_SUBTREE_PREFIX :
+                       DN_ONE_PREFIX;
+       cx.ids = ids;
+       cx.buf = stack;
+       cx.op = op;
+
+       BDB_IDL_ZERO( ids );
+       if ( cx.prefix == DN_SUBTREE_PREFIX ) {
+               bdb_idl_insert( ids, cx.id );
+       }
+
+       DBTzero(&cx.key);
+       cx.key.data = &cx.id;
+       cx.key.ulen = sizeof(ID);
+       cx.key.size = sizeof(ID);
+       cx.key.flags = DB_DBT_USERMEM;
+
+       DBTzero(&cx.data);
+
+       return hdb_dn2idl_internal(&cx);
+}
+#endif /* BDB_HIER */