- if( matched != NULL ) {
- *matched = NULL;
- rc = bdb_dn2id_matched( be, tid, dn, &id, &matchedDN );
- } else {
- rc = bdb_dn2id( be, tid, dn, &id );
- }
-
- if( rc != 0 ) {
- return rc;
- }
-
- if( matchedDN == NULL ) {
- rc = bdb_id2entry( be, tid, id, e );
+ 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 ) {
+ rc2 = bdb_cache_find_id( op, tid, ei->bei_id,
+ &ei, ID_LOCKED, lock );
+ if ( rc2 ) rc = rc2;
+ } else if ( ei ) {
+ bdb_cache_entryinfo_unlock( ei );
+ memset( lock, 0, sizeof( *lock ));
+ lock->mode = DB_LOCK_NG;
+ }
+ } else if ( ei ) {
+ bdb_cache_entryinfo_unlock( ei );
+ }