X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2entry.c;h=468d3a685b0c08d280e0f38b0a0b8c32834d99bf;hb=d3aae2dc427d1fd1bef8d236cde39524cbc35396;hp=b95ae4ea6a9bf80b19d636fc213b4d5b48fe6f97;hpb=66dc664930cc9f9dd3eb5c12669895fa33c32ccc;p=openldap
diff --git a/servers/slapd/back-bdb/dn2entry.c b/servers/slapd/back-bdb/dn2entry.c
index b95ae4ea6a..468d3a685b 100644
--- a/servers/slapd/back-bdb/dn2entry.c
+++ b/servers/slapd/back-bdb/dn2entry.c
@@ -1,8 +1,17 @@
/* dn2entry.c - routines to deal with the dn2id / id2entry glue */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2000-2009 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
+ * .
*/
#include "portable.h"
@@ -14,42 +23,61 @@
/*
* 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(
- BackendDB *be,
+ Operation *op,
DB_TXN *tid,
struct berval *dn,
- Entry **e,
- Entry **matched,
- int flags )
+ EntryInfo **e,
+ int matched,
+ DB_LOCK *lock )
{
- int rc;
- ID id;
- char *matchedDN = NULL;
+ EntryInfo *ei = NULL;
+ int rc, rc2;
Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry(\"%s\")\n",
dn->bv_val, 0, 0 );
*e = NULL;
- 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 );
+ }
} else {
- rc = bdb_id2entry( be, tid, id, matched );
+ rc = bdb_cache_find_id( op, tid, ei->bei_id, &ei, ID_LOCKED,
+ lock );
+ if ( rc == 0 ) {
+ *e = ei;
+ } else if ( matched && rc == DB_NOTFOUND ) {
+ /* always return EntryInfo */
+ if ( ei->bei_parent ) {
+ ei = ei->bei_parent;
+ rc2 = bdb_cache_find_id( op, tid, ei->bei_id, &ei, 0,
+ lock );
+ if ( rc2 ) rc = rc2;
+ }
+ *e = ei;
+ }
}
return rc;