ITS#5658 hppa fixes

[openldap] / servers / slapd / back-bdb / dn2entry.c

diff --git a/servers/slapd/back-bdb/dn2entry.c b/servers/slapd/back-bdb/dn2entry.c
index af5981f7cde99e8f272f2cc63b20c117c96e8ecd..468d3a685b0c08d280e0f38b0a0b8c32834d99bf 100644 (file)
--- 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 <http://www.openldap.org/>.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -12,7 +21,6 @@
 
 #include "back-bdb.h"
 
-
 /*
  * dn2entry - look up dn in the cache/indexes and return the corresponding
  * entry. If the requested DN is not found and matched is TRUE, return info
@@ -21,52 +29,53 @@
 
 int
 bdb_dn2entry(
-       BackendDB       *be,
+       Operation *op,
        DB_TXN *tid,
        struct berval *dn,
        EntryInfo **e,
        int matched,
-       u_int32_t locker,
-       DB_LOCK *lock,
-       void *ctx )
+       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;
 
-       rc = bdb_cache_find_ndn( be, tid, dn, &ei, locker, ctx );
+       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( be, tid, ei->bei_id,
-                                       &ei, 1, locker, lock, ctx );
-                       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( be, tid, ei->bei_id, &ei, 1,
-                       locker, lock, ctx );
+               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( be, tid, ei->bei_id, &ei, 1,
-                               locker, lock, ctx );
+                       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;
                }
        }