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 9b5db4549291189ddd85d3449416734de4c75d41..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
  */
 
@@ -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
@@ -480,7 +492,7 @@ equality_candidates(
                if( idl == NULL ) break;
        }
 
-       bvarray_free( keys );
+       ber_bvarray_free( keys );
 
        ldbm_cache_close( be, db );
 
@@ -662,7 +674,7 @@ approx_candidates(
                if( idl == NULL ) break;
        }
 
-       bvarray_free( keys );
+       ber_bvarray_free( keys );
 
        ldbm_cache_close( be, db );
 
@@ -900,7 +912,7 @@ substring_candidates(
                if( idl == NULL ) break;
        }
 
-       bvarray_free( keys );
+       ber_bvarray_free( keys );
 
        ldbm_cache_close( be, db );