Add a default case with assert() just in case.

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

diff --git a/servers/slapd/back-ldbm/attribute.c b/servers/slapd/back-ldbm/attribute.c
index 0e1e4303cd9d7a623cf9db9d2e30ca1f2e6dcb57..46403a74725fe49545eacdbae1a735ab012d6301 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
  */
 
@@ -28,18 +28,19 @@ ldbm_back_attribute(
        Entry   *target,
        struct berval   *entry_ndn,
        AttributeDescription *entry_at,
-       struct berval ***vals )
+       BerVarray *vals )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;    
        Entry        *e;
-       int          i, j, rc;
+       int          rc;
        Attribute   *attr;
-       struct berval **v;
+       BerVarray v;
        const char *entry_at_name = entry_at->ad_cname.bv_val;
+       struct berval *iv, *jv;
 
 #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,
@@ -48,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 ); 
@@ -58,7 +59,7 @@ ldbm_back_attribute(
                target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
-       if (target != NULL && strcmp(target->e_ndn, entry_ndn->bv_val) == 0) {
+       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,15 +75,15 @@ ldbm_back_attribute(
 
        } else {
                /* can we find entry with reader lock */
-               if ((e = dn2entry_r(be, entry_ndn->bv_val, NULL )) == NULL) {
+               if ((e = dn2entry_r(be, entry_ndn, NULL )) == NULL) {
 #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; 
@@ -157,31 +158,31 @@ ldbm_back_attribute(
                goto return_results;
        }
 
-       for ( i = 0; attr->a_vals[i] != NULL; i++ ) {
+       for ( iv = attr->a_vals; iv->bv_val != NULL; iv++ ) {
                /* count them */
        }
 
-       v = (struct berval **) ch_malloc( sizeof(struct berval *) * (i+1) );
+       v = (BerVarray) ch_malloc( sizeof(struct berval) * ((iv - attr->a_vals)+1) );
 
-       for ( i=0, j=0; attr->a_vals[i] != NULL; i++ ) {
+       for ( iv=attr->a_vals, jv=v; iv->bv_val; iv++ ) {
                if( conn != NULL
                        && op != NULL
                        && access_allowed(be, conn, op, e, entry_at,
-                               attr->a_vals[i], ACL_READ) == 0)
+                               iv, ACL_READ) == 0)
                {
                        continue;
                }
-               v[j] = ber_bvdup( attr->a_vals[i] );
+               ber_dupbv( jv, iv );
 
-               if( v[j] != NULL ) j++;
+               if( jv->bv_val != NULL ) jv++;
        }
 
-       if( j == 0 ) {
+       if( jv == v ) {
                ch_free( v );
                *vals = NULL;
                rc = LDAP_INSUFFICIENT_ACCESS;
        } else {
-               v[j] = NULL;
+               jv->bv_val = NULL;
                *vals = v;
                rc = LDAP_SUCCESS;
        }
@@ -195,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);