More for 2.2beta

[openldap] / servers / slapd / back-bdb / dn2entry.c

diff --git a/servers/slapd/back-bdb/dn2entry.c b/servers/slapd/back-bdb/dn2entry.c
index a4cffd8b2ddb577b18e8e24be9acbe5825efa26e..fa6ee14b02a3040f7bfd1e75e60b178c49ecccf7 100644 (file)
--- a/servers/slapd/back-bdb/dn2entry.c
+++ b/servers/slapd/back-bdb/dn2entry.c
@@ -1,7 +1,7 @@
 /* dn2entry.c - routines to deal with the dn2id / id2entry glue */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,42 +14,59 @@
 
 /*
  * dn2entry - look up dn in the cache/indexes and return the corresponding
- * entry.
+ * entry. If the requested DN is not found and matched is TRUE, return info
+ * for the closest ancestor of the DN. Otherwise e is NULL.
  */
 
 int
-bdb_dn2entry_rw(
-       BackendDB       *be,
+bdb_dn2entry(
+       Operation *op,
        DB_TXN *tid,
        struct berval *dn,
-       Entry **e,
-       Entry **matched,
-       int flags,
-       int rw )
+       EntryInfo **e,
+       int matched,
+       u_int32_t locker,
+       DB_LOCK *lock )
 {
+       EntryInfo *ei = NULL;
        int rc;
-       ID              id, id2 = 0;
 
-       Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry_rw(\"%s\")\n",
+#ifdef NEW_LOGGING
+       LDAP_LOG ( CACHE, ARGS, "bdb_dn2entry(\"%s\")\n", dn->bv_val, 0, 0 );
+#else
+       Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry(\"%s\")\n",
                dn->bv_val, 0, 0 );
+#endif
 
        *e = NULL;
 
-       if( matched != NULL ) {
-               *matched = NULL;
-               rc = bdb_dn2id_matched( be, tid, dn, &id, &id2 );
+       rc = bdb_cache_find_ndn( op, tid, dn, &ei );
+       if ( rc ) {
+               if ( matched && rc == DB_NOTFOUND ) {
+                       /* Set the return value, whether we have its entry
+                        * or not.
+                        */
+                       *e = ei;
+                       if ( ei && ei->bei_id )
+                               bdb_cache_find_id( op, tid, ei->bei_id,
+                                       &ei, 1, locker, lock );
+                       else if ( ei )
+                               bdb_cache_entryinfo_unlock( ei );
+               } else if ( ei ) {
+                       bdb_cache_entryinfo_unlock( ei );
+               }
        } else {
-               rc = bdb_dn2id( be, tid, dn, &id );
-       }
-
-       if( rc != 0 ) {
-               return rc;
-       }
-
-       if( id2 == 0 ) {
-               rc = bdb_id2entry_rw( be, tid, id, e, rw );
-       } else {
-               rc = bdb_id2entry_r( be, tid, id2, matched);
+               rc = bdb_cache_find_id( op, tid, ei->bei_id, &ei, 1,
+                       locker, lock );
+               if ( rc == 0 ) {
+                       *e = ei;
+               } else if ( matched && rc == DB_NOTFOUND ) {
+                       /* always return EntryInfo */
+                       ei = ei->bei_parent;
+                       bdb_cache_find_id( op, tid, ei->bei_id, &ei, 1,
+                               locker, lock );
+                       *e = ei;
+               }
        }
 
        return rc;