error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldbm/attribute.c b/servers/slapd/back-ldbm/attribute.c
index db43ac93f1b266eeddd0d45d2f2d82b4f8b22f21..5a7dfa08691b14d858f7df2c409646d024bddf6e 100644 (file)
--- a/servers/slapd/back-ldbm/attribute.c
+++ b/servers/slapd/back-ldbm/attribute.c
@@ -1,7 +1,7 @@
 /* attribute.c - ldbm 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
  */
 
@@ -32,7 +32,7 @@ ldbm_back_attribute(
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;    
        Entry        *e;
-       int          i, j, rc;
+       int          rc;
        Attribute   *attr;
        BVarray v;
        const char *entry_at_name = entry_at->ad_cname.bv_val;
@@ -40,7 +40,7 @@ ldbm_back_attribute(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
-               "ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn ));
+               "ldbm_back_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val ));
        LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
                "ldbm_back_attribute: at: \"%s\"\n", entry_at_name));
        LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
@@ -49,7 +49,7 @@ ldbm_back_attribute(
 #else
        Debug( LDAP_DEBUG_ARGS,
                "=> ldbm_back_attribute: gr dn: \"%s\"\n",
-               entry_ndn, 0, 0 ); 
+               entry_ndn->bv_val, 0, 0 ); 
        Debug( LDAP_DEBUG_ARGS,
                "=> ldbm_back_attribute: at: \"%s\"\n", 
                entry_at_name, 0, 0 ); 
@@ -79,11 +79,11 @@ ldbm_back_attribute(
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
                                "ldbm_back_attribute: cannot find entry (%s)\n",
-                               entry_ndn ));
+                               entry_ndn->bv_val ));
 #else
                        Debug( LDAP_DEBUG_ACL,
                                "=> ldbm_back_attribute: cannot find entry: \"%s\"\n",
-                                       entry_ndn, 0, 0 ); 
+                                       entry_ndn->bv_val, 0, 0 ); 
 #endif
 
                        return LDAP_NO_SUCH_OBJECT; 
@@ -158,11 +158,11 @@ ldbm_back_attribute(
                goto return_results;
        }
 
-       for ( i = 0; attr->a_vals[i].bv_val != NULL; i++ ) {
+       for ( iv = attr->a_vals; iv->bv_val != NULL; iv++ ) {
                /* count them */
        }
 
-       v = (BVarray) ch_malloc( sizeof(struct berval) * (i+1) );
+       v = (BVarray) ch_malloc( sizeof(struct berval) * ((iv - attr->a_vals)+1) );
 
        for ( iv=attr->a_vals, jv=v; iv->bv_val; iv++ ) {
                if( conn != NULL
@@ -196,11 +196,11 @@ return_results:
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
                   "ldbm_back_attribute: rc=%d nvals=%d.\n",
-                  rc, j ));
+                  rc, jv - v ));
 #else
        Debug( LDAP_DEBUG_TRACE,
                "ldbm_back_attribute: rc=%d nvals=%d\n",
-               rc, j, 0 ); 
+               rc, jv - v, 0 ); 
 #endif
 
        return(rc);