Modify ad_cmp() macro to support use as an ordering function.

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

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index 3c976a26cd6002c45ff539a5748fb662d0476d2d..f2481638307ecf949d0cda91058b87bc0056f6f4 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,13 +27,15 @@ bdb_attribute(
        Entry *target,
        struct berval *entry_ndn,
        AttributeDescription *entry_at,
-       struct berval ***vals )
+       BerVarray *vals )
 {
        struct bdbinfo *li = (struct bdbinfo *) 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;
-       struct berval **v;
+       BerVarray v;
        const char *entry_at_name = entry_at->ad_cname.bv_val;
 
 #ifdef NEW_LOGGING
@@ -58,7 +59,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 +79,15 @@ bdb_attribute(
 
        } else {
                /* can we find entry */
-               rc = bdb_dn2entry( be, NULL, entry_ndn, &e, NULL, 0 );
+               rc = bdb_dn2entry( be, txn, 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) {
@@ -159,23 +167,23 @@ bdb_attribute(
                goto return_results;
        }
 
-       for ( i = 0; attr->a_vals[i] != NULL; i++ ) {
+       for ( i = 0; attr->a_vals[i].bv_val != NULL; i++ ) {
                /* count them */
        }
 
-       v = (struct berval **) 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] != NULL; i++ ) {
+       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) == 0)
                {
                        continue;
                }
-               v[j] = ber_bvdup( attr->a_vals[i] );
+               ber_dupbv( &v[j], &attr->a_vals[i] );
 
-               if( v[j] != NULL ) j++;
+               if( v[j].bv_val != NULL ) j++;
        }
 
        if( j == 0 ) {
@@ -183,7 +191,8 @@ bdb_attribute(
                *vals = NULL;
                rc = LDAP_INSUFFICIENT_ACCESS;
        } else {
-               v[j] = NULL;
+               v[j].bv_val = NULL;
+               v[j].bv_len = 0;
                *vals = v;
                rc = LDAP_SUCCESS;
        }