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

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

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 67452f53d01f30d598b0abbf2c1f14dc4165bdcb..c16404a3ac50bbeb89fffafb7d455169ca4b3c0c 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -47,7 +47,7 @@ ldbm_back_search(
        ID_BLOCK                *candidates;
        ID              id, cursor;
        Entry           *e;
-       BVarray         v2refs = NULL;
+       BerVarray               v2refs = NULL;
        Entry   *matched = NULL;
        struct berval   realbase = { 0, NULL };
        int             nentries = 0;
@@ -91,12 +91,12 @@ ldbm_back_search(
        }
 
        if ( e == NULL ) {
-               struct berval *matched_dn = NULL;
-               BVarray refs = NULL;
+               struct berval matched_dn = { 0, NULL };
+               BerVarray refs = NULL;
 
                if ( matched != NULL ) {
-                       BVarray erefs;
-                       matched_dn = ber_bvdup( &matched->e_name );
+                       BerVarray erefs;
+                       ber_dupbv( &matched_dn, &matched->e_name );
 
                        erefs = is_entry_referral( matched )
                                ? get_entry_referrals( be, conn, op, matched )
@@ -105,10 +105,10 @@ ldbm_back_search(
                        cache_return_entry_r( &li->li_cache, matched );
 
                        if( erefs ) {
-                               refs = referral_rewrite( erefs, matched_dn,
+                               refs = referral_rewrite( erefs, &matched_dn,
                                        base, scope );
 
-                               bvarray_free( erefs );
+                               ber_bvarray_free( erefs );
                        }
 
                } else {
@@ -116,20 +116,23 @@ ldbm_back_search(
                                NULL, base, scope );
                }
 
-               send_ldap_result( conn, op, err,
-                       matched_dn ? matched_dn->bv_val : NULL, 
+               send_ldap_result( conn, op, err, matched_dn.bv_val, 
                        text, refs, NULL );
 
-               bvarray_free( refs );
-               ber_bvfree( matched_dn );
+               ber_bvarray_free( refs );
+               ber_memfree( matched_dn.bv_val );
                return 1;
        }
 
        if (!manageDSAit && is_entry_referral( e ) ) {
                /* entry is a referral, don't allow add */
-               struct berval *matched_dn = ber_bvdup( &e->e_name );
-               BVarray erefs = get_entry_referrals( be, conn, op, e );
-               BVarray refs = NULL;
+               struct berval matched_dn;
+               BerVarray erefs;
+               BerVarray refs;
+
+               ber_dupbv( &matched_dn, &e->e_name );
+               erefs = get_entry_referrals( be, conn, op, e );
+               refs = NULL;
 
                cache_return_entry_r( &li->li_cache, e );
 
@@ -144,24 +147,24 @@ ldbm_back_search(
 #endif
 
                if( erefs ) {
-                       refs = referral_rewrite( erefs, matched_dn,
+                       refs = referral_rewrite( erefs, &matched_dn,
                                base, scope );
 
-                       bvarray_free( erefs );
+                       ber_bvarray_free( erefs );
                }
 
                if( refs ) {
                        send_ldap_result( conn, op, LDAP_REFERRAL,
-                               matched_dn->bv_val, NULL, refs, NULL );
-                       bvarray_free( refs );
+                               matched_dn.bv_val, NULL, refs, NULL );
+                       ber_bvarray_free( refs );
 
                } else {
                        send_ldap_result( conn, op, LDAP_OTHER,
-                               matched_dn->bv_val,
+                               matched_dn.bv_val,
                        "bad referral object", NULL, NULL );
                }
 
-               ber_bvfree( matched_dn );
+               ber_memfree( matched_dn.bv_val );
                return 1;
        }
 
@@ -392,9 +395,9 @@ searchit:
                        }
 
                        if( scopeok ) {
-                               BVarray erefs = get_entry_referrals(
+                               BerVarray erefs = get_entry_referrals(
                                        be, conn, op, e );
-                               BVarray refs = referral_rewrite( erefs,
+                               BerVarray refs = referral_rewrite( erefs,
                                        &e->e_name, NULL,
                                        scope == LDAP_SCOPE_SUBTREE
                                                ? LDAP_SCOPE_SUBTREE
@@ -403,7 +406,7 @@ searchit:
                                send_search_reference( be, conn, op,
                                        e, refs, NULL, &v2refs );
 
-                               bvarray_free( refs );
+                               ber_bvarray_free( refs );
 
                        } else {
 #ifdef NEW_LOGGING
@@ -509,7 +512,7 @@ done:
        if( candidates != NULL )
                idl_free( candidates );
 
-       if( v2refs ) bvarray_free( v2refs );
+       if( v2refs ) ber_bvarray_free( v2refs );
        if( realbase.bv_val ) free( realbase.bv_val );
 
        return rc;