- if( matched != NULL ) {
- *matched = NULL;
- rc = bdb_dn2id_matched( be, tid, dn, &id, &id2, flags );
- } else {
- rc = bdb_dn2id( be, tid, dn, &id, flags );
- }
-
- if( rc != 0 ) {
- return rc;
- }
-
- if( id2 == 0 ) {
- rc = bdb_id2entry_rw( be, tid, id, e, rw, locker, lock );
+ 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 );
+ }