X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2entry.c;h=c2817e23b22104671732c539b0c06adff54c940b;hb=c5b6a86502dc0c16027cd87e3d9544e9078083db;hp=b95ae4ea6a9bf80b19d636fc213b4d5b48fe6f97;hpb=66dc664930cc9f9dd3eb5c12669895fa33c32ccc;p=openldap

diff --git a/servers/slapd/back-bdb/dn2entry.c b/servers/slapd/back-bdb/dn2entry.c
index b95ae4ea6a..c2817e23b2 100644
--- 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-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,44 +12,51 @@
 
 #include "back-bdb.h"
 
+
 /*
  * dn2entry - look up dn in the cache/indexes and return the corresponding
  * entry.
  */
 
 int
-bdb_dn2entry(
+bdb_dn2entry_rw(
 	BackendDB	*be,
 	DB_TXN *tid,
 	struct berval *dn,
 	Entry **e,
 	Entry **matched,
-	int flags )
+	int flags,
+	int rw,
+	u_int32_t locker,
+	DB_LOCK *lock )
 {
 	int rc;
-	ID		id;
-	char	*matchedDN = NULL;
+	ID		id, id2 = 0;
 
-	Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry(\"%s\")\n",
+#ifdef NEW_LOGGING
+	LDAP_LOG ( CACHE, ARGS, "bdb_dn2entry_rw(\"%s\")\n", dn->bv_val, 0, 0 );
+#else
+	Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry_rw(\"%s\")\n",
 		dn->bv_val, 0, 0 );
+#endif
 
 	*e = NULL;
 
 	if( matched != NULL ) {
 		*matched = NULL;
-		rc = bdb_dn2id_matched( be, tid, dn, &id, &matchedDN );
+		rc = bdb_dn2id_matched( be, tid, dn, &id, &id2, flags );
 	} else {
-		rc = bdb_dn2id( be, tid, dn, &id );
+		rc = bdb_dn2id( be, tid, dn, &id, flags );
 	}
 
 	if( rc != 0 ) {
 		return rc;
 	}
 
-	if( matchedDN == NULL ) {
-		rc = bdb_id2entry( be, tid, id, e );
+	if( id2 == 0 ) {
+		rc = bdb_id2entry_rw( be, tid, id, e, rw, locker, lock );
 	} else {
-		rc = bdb_id2entry( be, tid, id, matched );
+		rc = bdb_id2entry_r( be, tid, id2, matched, locker, lock );
 	}
 
 	return rc;