X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2entry.c;h=468d3a685b0c08d280e0f38b0a0b8c32834d99bf;hb=d3aae2dc427d1fd1bef8d236cde39524cbc35396;hp=fa6ee14b02a3040f7bfd1e75e60b178c49ecccf7;hpb=03429046998f4ea337e3acf079dd7409065683d8;p=openldap
diff --git a/servers/slapd/back-bdb/dn2entry.c b/servers/slapd/back-bdb/dn2entry.c
index fa6ee14b02..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-2003 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"
@@ -25,18 +34,13 @@ bdb_dn2entry(
struct berval *dn,
EntryInfo **e,
int matched,
- u_int32_t locker,
DB_LOCK *lock )
{
EntryInfo *ei = NULL;
- int rc;
+ int rc, rc2;
-#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
*e = NULL;
@@ -47,24 +51,31 @@ bdb_dn2entry(
* 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 )
+ 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_cache_find_id( op, tid, ei->bei_id, &ei, 1,
- locker, lock );
+ 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 */
- ei = ei->bei_parent;
- bdb_cache_find_id( op, tid, ei->bei_id, &ei, 1,
- locker, lock );
+ 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;
}
}