X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2entry.c;h=25d79e5256d97ce2142db101b2d9dbe34235b48a;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=7568035eeb05b53e81497c8b7765db40101b5352;hpb=61a15be30a64e79667f96c0998f5f507254fd751;p=openldap
diff --git a/servers/slapd/back-bdb/dn2entry.c b/servers/slapd/back-bdb/dn2entry.c
index 7568035eeb..25d79e5256 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-2004 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,41 +23,60 @@
/*
* 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(
- Backend *be,
+ Operation *op,
DB_TXN *tid,
- const char *dn,
- Entry **e,
- Entry **matched,
- int flags )
+ struct berval *dn,
+ EntryInfo **e,
+ int matched,
+ u_int32_t locker,
+ DB_LOCK *lock )
{
+ EntryInfo *ei = NULL;
int rc;
- ID id;
- char *matchedDN = NULL;
- Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry: dn: \"%s\"\n",
- dn, 0, 0 );
+#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
- if( matched != NULL ) {
- rc = bdb_dn2id_matched( be, tid, dn, &id, &matchedDN );
- } else {
- rc = bdb_dn2id( be, tid, dn, &id );
- }
-
- if( rc != 0 ) {
- return rc;
- }
+ *e = NULL;
- 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 )
+ 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 {
- ch_free( matchedDN );
- rc = bdb_id2entry( be, tid, id, 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;
-}
\ No newline at end of file
+}