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 ecafef36b148e6be60ac57386d21ea34ff94fd4d..46403a74725fe49545eacdbae1a735ab012d6301 100644 (file)
--- a/servers/slapd/back-ldbm/attribute.c
+++ b/servers/slapd/back-ldbm/attribute.c
@@ -28,19 +28,19 @@ ldbm_back_attribute(
        Entry   *target,
        struct berval   *entry_ndn,
        AttributeDescription *entry_at,
-       BVarray *vals )
+       BerVarray *vals )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;    
        Entry        *e;
        int          rc;
        Attribute   *attr;
-       BVarray 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,
@@ -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 ); 
@@ -59,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
@@ -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; 
@@ -162,7 +162,7 @@ ldbm_back_attribute(
                /* count them */
        }
 
-       v = (BVarray) ch_malloc( sizeof(struct berval) * ((iv - attr->a_vals)+1) );
+       v = (BerVarray) ch_malloc( sizeof(struct berval) * ((iv - attr->a_vals)+1) );
 
        for ( iv=attr->a_vals, jv=v; iv->bv_val; iv++ ) {
                if( conn != NULL