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

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

diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c
index 17da4e7fabb6512b43d683634eebdb536662173a..d4a06344bc57ed537ccb60d23788ec81ddf00c44 100644 (file)
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -1,6 +1,6 @@
 /* $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
  */
 
@@ -27,7 +27,7 @@ static void new_superior(
        struct berval *res );
 
 static int dnlist_subordinate(
-       BVarray dnlist,
+       BerVarray dnlist,
        struct berval *dn );
 
 Entry *deref_internal_r(
@@ -43,7 +43,7 @@ Entry *deref_internal_r(
        Entry *entry;
        Entry *sup;
        unsigned depth;
-       BVarray dnlist;
+       BerVarray dnlist;
 
        assert( ( alias != NULL && dn_in == NULL )
                || ( alias == NULL && dn_in != NULL ) );
@@ -63,7 +63,7 @@ Entry *deref_internal_r(
        }
 
        dnlist = NULL;
-       bvarray_add( &dnlist, &dn );
+       ber_bvarray_add( &dnlist, &dn );
 
        for( depth=0 ; ; depth++ ) {
                if( entry != NULL ) {
@@ -113,7 +113,7 @@ Entry *deref_internal_r(
                                cache_return_entry_r(&li->li_cache, entry );
                                entry = newe;
                                ber_dupbv( &dn, &entry->e_nname );
-                               bvarray_add( &dnlist, &dn );
+                               ber_bvarray_add( &dnlist, &dn );
                                continue;
                        }
                        
@@ -177,7 +177,7 @@ Entry *deref_internal_r(
                                cache_return_entry_r(&li->li_cache, sup );
                                entry = newe;
                                ber_dupbv( &dn, &entry->e_nname );
-                               bvarray_add( &dnlist, &dn );
+                               ber_bvarray_add( &dnlist, &dn );
                                continue;
                        }
                        
@@ -198,7 +198,7 @@ Entry *deref_internal_r(
        }
 
        free( dn.bv_val );
-       bvarray_free( dnlist );
+       ber_bvarray_free( dnlist );
        return entry;
 }
 
@@ -228,7 +228,7 @@ static int get_alias_dn(
        /* 
         * aliasedObjectName should be SINGLE-VALUED with a single value. 
         */                     
-       if ( a->a_vals[0] == NULL || a->a_vals[0]->bv_val == NULL ) {
+       if ( a->a_vals[0].bv_val == NULL ) {
                /*
                 * there was an aliasedobjectname defined but no data.
                 */
@@ -237,13 +237,13 @@ static int get_alias_dn(
                return -1;
        }
 
-       if( a->a_vals[1] != NULL ) {
+       if( a->a_vals[1].bv_val != NULL ) {
                *err = LDAP_ALIAS_PROBLEM;
                *errmsg = "alias has multivalued aliasedObjectName";
                return -1;
        }
 
-       rc = dnNormalize2( NULL, a->a_vals[0], ndn );
+       rc = dnNormalize2( NULL, &a->a_vals[0], ndn );
        if( rc != LDAP_SUCCESS ) {
                *err = LDAP_ALIAS_PROBLEM;
                *errmsg = "alias aliasedObjectName value is invalid";
@@ -276,7 +276,7 @@ static void new_superior(
 }
 
 static int dnlist_subordinate(
-       BVarray dnlist,
+       BerVarray dnlist,
        struct berval *dn )
 {
        assert( dnlist );