Set peeraddr also for IPv6, fixes ITS#1918

[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..bc370f239b6916d167899796e692ca9e6c52cf62 100644 (file)
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -1,7 +1,7 @@
 /* filterindex.c - generate the list of candidate entries from a filter */
 /* $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
  */
 
@@ -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
@@ -135,7 +135,7 @@ filter_candidates(
                Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
 #endif
 
-               result = presence_candidates( be, f->f_desc );
+               result = presence_candidates( be, f->f_ava->aa_desc );
                break;
 
        case LDAP_FILTER_LE:
@@ -146,7 +146,7 @@ filter_candidates(
                Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
 #endif
 
-               result = presence_candidates( be, f->f_desc );
+               result = presence_candidates( be, f->f_ava->aa_desc );
                break;
 
        case LDAP_FILTER_AND:
@@ -187,6 +187,18 @@ filter_candidates(
                 */
                result = idl_allids( be );
                break;
+       default:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "filter_candidates:  UNKNOWN\n" ));
+#else
+               Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN\n", 0, 0, 0 );
+#endif
+               /* unknown filters must not return NULL, to allow
+                * extended filter processing to be done later.
+                */
+               result = idl_allids( be );
+               break;
        }
 
 #ifdef NEW_LOGGING
@@ -223,6 +235,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 +343,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 +401,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 +448,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 +492,7 @@ equality_candidates(
                if( idl == NULL ) break;
        }
 
-       ber_bvecfree( keys );
+       ber_bvarray_free( keys );
 
        ldbm_cache_close( be, db );
 
@@ -506,7 +522,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 +585,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 +632,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 +674,7 @@ approx_candidates(
                if( idl == NULL ) break;
        }
 
-       ber_bvecfree( keys );
+       ber_bvarray_free( keys );
 
        ldbm_cache_close( be, db );
 
@@ -747,7 +763,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 +869,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 +912,7 @@ substring_candidates(
                if( idl == NULL ) break;
        }
 
-       ber_bvecfree( keys );
+       ber_bvarray_free( keys );
 
        ldbm_cache_close( be, db );