Remove abandon cruft

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

diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index 55f873ba01d1e0d383c07f9bdaa9abea21e351b3..9b5db4549291189ddd85d3449416734de4c75d41 100644 (file)
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -95,7 +95,7 @@ filter_candidates(
                LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
                           "filter_candidates:  EQUALITY (%s),(%s)\n",
                           f->f_ava->aa_desc->ad_cname.bv_val,
-                          f->f_ava->aa_value->bv_val ));
+                          f->f_ava->aa_value.bv_val ));
 #else
                Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
 #endif
@@ -108,7 +108,7 @@ filter_candidates(
                LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
                           "filter_candidates:  APPROX (%s), (%s)\n",
                           f->f_ava->aa_desc->ad_cname.bv_val,
-                          f->f_ava->aa_value->bv_val ));
+                          f->f_ava->aa_value.bv_val ));
 #else
                Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
 #endif
@@ -223,6 +223,10 @@ presence_candidates(
 
        idl = idl_allids( be );
 
+       if( desc == slap_schema.si_ad_objectClass ) {
+               return idl;
+       }
+
        rc = index_param( be, desc, LDAP_FILTER_PRESENT,
                &dbname, &mask, &prefix );
 
@@ -327,7 +331,7 @@ equality_candidates(
        char *dbname;
        slap_mask_t mask;
        struct berval prefix = {0};
-       struct berval **keys = NULL;
+       struct berval *keys = NULL;
        MatchingRule *mr;
 
 #ifdef NEW_LOGGING
@@ -385,7 +389,7 @@ equality_candidates(
                ava->aa_desc->ad_type->sat_syntax,
                mr,
                &prefix,
-               ava->aa_value,
+               &ava->aa_value,
                &keys );
 
        if( rc != LDAP_SUCCESS ) {
@@ -432,11 +436,11 @@ equality_candidates(
                return idl;
        }
 
-       for ( i= 0; keys[i] != NULL; i++ ) {
+       for ( i= 0; keys[i].bv_val != NULL; i++ ) {
                ID_BLOCK *save;
                ID_BLOCK *tmp;
 
-               rc = key_read( be, db, keys[i], &tmp );
+               rc = key_read( be, db, &keys[i], &tmp );
 
                if( rc != LDAP_SUCCESS ) {
                        idl_free( idl );
@@ -476,7 +480,7 @@ equality_candidates(
                if( idl == NULL ) break;
        }
 
-       ber_bvecfree( keys );
+       bvarray_free( keys );
 
        ldbm_cache_close( be, db );
 
@@ -506,7 +510,7 @@ approx_candidates(
        char *dbname;
        slap_mask_t mask;
        struct berval prefix = {0};
-       struct berval **keys = NULL;
+       struct berval *keys = NULL;
        MatchingRule *mr;
 
 #ifdef NEW_LOGGING
@@ -569,7 +573,7 @@ approx_candidates(
                ava->aa_desc->ad_type->sat_syntax,
                mr,
                &prefix,
-               ava->aa_value,
+               &ava->aa_value,
                &keys );
 
        if( rc != LDAP_SUCCESS ) {
@@ -616,11 +620,11 @@ approx_candidates(
                return idl;
        }
 
-       for ( i= 0; keys[i] != NULL; i++ ) {
+       for ( i= 0; keys[i].bv_val != NULL; i++ ) {
                ID_BLOCK *save;
                ID_BLOCK *tmp;
 
-               rc = key_read( be, db, keys[i], &tmp );
+               rc = key_read( be, db, &keys[i], &tmp );
 
                if( rc != LDAP_SUCCESS ) {
                        idl_free( idl );
@@ -658,7 +662,7 @@ approx_candidates(
                if( idl == NULL ) break;
        }
 
-       ber_bvecfree( keys );
+       bvarray_free( keys );
 
        ldbm_cache_close( be, db );
 
@@ -747,7 +751,7 @@ substring_candidates(
        char *dbname;
        slap_mask_t mask;
        struct berval prefix = {0};
-       struct berval **keys = NULL;
+       struct berval *keys = NULL;
        MatchingRule *mr;
 
 #ifdef NEW_LOGGING
@@ -853,11 +857,11 @@ substring_candidates(
                return idl;
        }
 
-       for ( i= 0; keys[i] != NULL; i++ ) {
+       for ( i= 0; keys[i].bv_val != NULL; i++ ) {
                ID_BLOCK *save;
                ID_BLOCK *tmp;
 
-               rc = key_read( be, db, keys[i], &tmp );
+               rc = key_read( be, db, &keys[i], &tmp );
 
                if( rc != LDAP_SUCCESS ) {
                        idl_free( idl );
@@ -896,7 +900,7 @@ substring_candidates(
                if( idl == NULL ) break;
        }
 
-       ber_bvecfree( keys );
+       bvarray_free( keys );
 
        ldbm_cache_close( be, db );