Added LDAP_LOG messages

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

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index d75b6fe1f7edf6ae38eefcdb631182529f9850e9..bf6505ebe2049d173b2ff4940406f16148c5901a 100644 (file)
--- a/servers/slapd/back-bdb/attribute.c
+++ b/servers/slapd/back-bdb/attribute.c
@@ -1,7 +1,7 @@
 /* attribute.c - bdb backend acl attribute routine */
 /* $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
  */
 
@@ -16,7 +16,6 @@
 #include "back-bdb.h"
 #include "proto-bdb.h"
 
-
 /* return LDAP_SUCCESS IFF we can retrieve the attributes
  * of entry with e_ndn
  */
@@ -28,14 +27,17 @@ bdb_attribute(
        Entry *target,
        struct berval *entry_ndn,
        AttributeDescription *entry_at,
-       BVarray *vals )
+       BerVarray *vals )
 {
-       struct bdbinfo *li = (struct bdbinfo *) be->be_private;
+       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       struct bdb_op_info *boi = (struct bdb_op_info *) op->o_private;
+       DB_TXN *txn = NULL;
        Entry *e;
        int     i, j, rc;
        Attribute *attr;
-       BVarray v;
+       BerVarray v;
        const char *entry_at_name = entry_at->ad_cname.bv_val;
+       AccessControlState acl_state = ACL_STATE_INIT;
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
@@ -58,7 +60,11 @@ bdb_attribute(
                target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
-       if (target != NULL && strcmp(target->e_ndn, entry_ndn->bv_val) == 0) {
+       if( boi != NULL && be == boi->boi_bdb ) {
+               txn = boi->boi_txn;
+       }
+
+       if (target != NULL && dn_match(&target->e_nname, entry_ndn)) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING
@@ -74,12 +80,15 @@ bdb_attribute(
 
        } else {
                /* can we find entry */
-               rc = bdb_dn2entry( be, NULL, entry_ndn, &e, NULL, 0 );
+               rc = bdb_dn2entry_r( be, NULL, entry_ndn, &e, NULL, 0 );
                switch( rc ) {
                case DB_NOTFOUND:
                case 0:
                        break;
                default:
+                       if( txn != NULL ) {
+                               boi->boi_err = rc;
+                       }
                        return LDAP_OTHER;
                }
                if (e == NULL) {
@@ -106,6 +115,7 @@ bdb_attribute(
 #endif
        }
 
+#ifdef BDB_ALIASES
        /* find attribute values */
        if( is_entry_alias( e ) ) {
 #ifdef NEW_LOGGING
@@ -118,6 +128,7 @@ bdb_attribute(
                rc = LDAP_ALIAS_PROBLEM;
                goto return_results;
        }
+#endif
 
        if( is_entry_referral( e ) ) {
 #ifdef NEW_LOGGING
@@ -132,8 +143,8 @@ bdb_attribute(
        }
 
        if (conn != NULL && op != NULL
-               && access_allowed(be, conn, op, e, slap_schema.si_ad_entry,
-                       NULL, ACL_READ) == 0)
+               && access_allowed( be, conn, op, e, slap_schema.si_ad_entry,
+                       NULL, ACL_READ, &acl_state ) == 0 )
        {
                rc = LDAP_INSUFFICIENT_ACCESS;
                goto return_results;
@@ -153,7 +164,8 @@ bdb_attribute(
        }
 
        if (conn != NULL && op != NULL
-               && access_allowed(be, conn, op, e, entry_at, NULL, ACL_READ) == 0)
+               && access_allowed( be, conn, op, e, entry_at, NULL, ACL_READ, 
+                          &acl_state ) == 0 )
        {
                rc = LDAP_INSUFFICIENT_ACCESS;
                goto return_results;
@@ -163,13 +175,13 @@ bdb_attribute(
                /* count them */
        }
 
-       v = (BVarray) ch_malloc( sizeof(struct berval) * (i+1) );
+       v = (BerVarray) ch_malloc( sizeof(struct berval) * (i+1) );
 
        for ( i=0, j=0; attr->a_vals[i].bv_val != NULL; i++ ) {
                if( conn != NULL
                        && op != NULL
                        && access_allowed(be, conn, op, e, entry_at,
-                               &attr->a_vals[i], ACL_READ) == 0)
+                               &attr->a_vals[i], ACL_READ, &acl_state ) == 0)
                {
                        continue;
                }
@@ -192,7 +204,7 @@ bdb_attribute(
 return_results:
        if( target != e ) {
                /* free entry */
-               bdb_entry_return( be, e );
+               bdb_cache_return_entry_r(&bdb->bi_cache, e);
        }
 
 #ifdef NEW_LOGGING