]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/filterindex.c
Fixed invalid cookie in pagedResults control (ITS#3089)
[openldap] / servers / slapd / back-bdb / filterindex.c
index 791d8769fcbe569193e74205690fa8246fa8c4c8..2dbb326e324c1ee5c63aa7233eefce292a47fa6d 100644 (file)
@@ -1,8 +1,17 @@
 /* filterindex.c - generate the list of candidate entries from a filter */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -56,36 +65,65 @@ bdb_filter_candidates(
 #else
        Debug( LDAP_DEBUG_FILTER, "=> bdb_filter_candidates\n", 0, 0, 0 );
 #endif
+#if 0
+       char *subtree="SUBTREE";
+#endif
 
        switch ( f->f_choice ) {
        case SLAPD_FILTER_COMPUTED:
+               switch( f->f_result ) {
+               case SLAPD_COMPARE_UNDEFINED:
+               /* This technically is not the same as FALSE, but it
+                * certainly will produce no matches.
+                */
+               /* FALL THRU */
+               case LDAP_COMPARE_FALSE:
+                       BDB_IDL_ZERO( ids );
+                       break;
+               case LDAP_COMPARE_TRUE: {
+                       struct bdb_info *bdb = (struct bdb_info *)op->o_bd->be_private;
+                       BDB_IDL_ALL( bdb, ids );
+                       } break;
+               case LDAP_SUCCESS:
+                       /* this is a pre-computed scope, leave it alone */
+                       break;
+               }
                break;
-
+#if 0  /* Not used any more, search calls bdb_dn2idl directly */
        case SLAPD_FILTER_DN_ONE:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN ONE\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN ONE\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tDN ONE\n", 0, 0, 0 );
 #endif
-               rc = bdb_dn2idl( op->o_bd, f->f_dn, DN_ONE_PREFIX, ids );
+               rc = bdb_dn2idl( op->o_bd, f->f_dn, DN_ONE_PREFIX, ids,
+                       stack, op->o_tmpmemctx );
                if( rc == DB_NOTFOUND ) {
                        BDB_IDL_ZERO( ids );
                        rc = 0;
                }
                break;
 
+       case SLAPD_FILTER_DN_CHILDREN:
+               subtree="CHILDREN";
+               /* Fall Thru */
        case SLAPD_FILTER_DN_SUBTREE:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN SUBTREE\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN %s\n",
+                       subtree, 0, 0 );
 #else
-               Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 );
+               Debug( LDAP_DEBUG_FILTER, "\tDN %s\n",
+                       subtree, 0, 0 );
 #endif
-               rc = bdb_dn2idl( op->o_bd, f->f_dn, DN_SUBTREE_PREFIX, ids );
+               rc = bdb_dn2idl( op->o_bd, f->f_dn, DN_SUBTREE_PREFIX, ids,
+                       stack, op->o_tmpmemctx );
                break;
-
+#endif
        case LDAP_FILTER_PRESENT:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tPRESENT\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tPRESENT\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
 #endif
@@ -94,7 +132,8 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_EQUALITY:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tEQUALITY\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tEQUALITY\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
 #endif
@@ -103,7 +142,8 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_APPROX:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAPPROX\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAPPROX\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
 #endif
@@ -112,7 +152,8 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_SUBSTRINGS:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 );
 #endif
@@ -122,7 +163,8 @@ bdb_filter_candidates(
        case LDAP_FILTER_GE:
                /* no GE index, use pres */
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tGE\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tGE\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
 #endif
@@ -132,7 +174,8 @@ bdb_filter_candidates(
        case LDAP_FILTER_LE:
                /* no LE index, use pres */
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tLE\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tLE\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
 #endif
@@ -142,7 +185,8 @@ bdb_filter_candidates(
        case LDAP_FILTER_NOT:
                /* no indexing to support NOT filters */
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tNOT\n",0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tNOT\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
 #endif
@@ -153,7 +197,8 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_AND:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAND\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAND\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 );
 #endif
@@ -163,7 +208,8 @@ bdb_filter_candidates(
 
        case LDAP_FILTER_OR:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tOR\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tOR\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 );
 #endif
@@ -173,7 +219,8 @@ bdb_filter_candidates(
 
        default:
 #ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n", 0, 0, 0 );
+               LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n",
+                       0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %lu\n",
                        (unsigned long) f->f_choice, 0, 0 );
@@ -217,11 +264,13 @@ list_candidates(
 #else
        Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
 #endif
-
-       /* Copy so we can propagate pre-computed IDLs */
-       BDB_IDL_CPY( save, ids );
-
        for ( f = flist; f != NULL; f = f->f_next ) {
+               /* ignore precomputed scopes */
+               if ( f->f_choice == SLAPD_FILTER_COMPUTED &&
+                    f->f_result == LDAP_SUCCESS ) {
+                       continue;
+               }
+               BDB_IDL_ZERO( save );
                rc = bdb_filter_candidates( op, f, save, tmp,
                        save+BDB_IDL_UM_SIZE );
 
@@ -298,8 +347,9 @@ presence_candidates(
                        desc->ad_cname.bv_val, 0, 0 );
 #endif
 
+       BDB_IDL_ALL( bdb, ids );
+
        if( desc == slap_schema.si_ad_objectClass ) {
-               BDB_IDL_ALL( bdb, ids );
                return 0;
        }
 
@@ -345,7 +395,7 @@ presence_candidates(
                        "<= bdb_presence_candidates: (%s) no prefix\n",
                        desc->ad_cname.bv_val, 0, 0 );
 #endif
-               return 0;
+               return -1;
        }
 
        rc = bdb_key_read( op->o_bd, db, NULL, &prefix, ids );
@@ -391,6 +441,7 @@ equality_candidates(
        ID *ids,
        ID *tmp )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        DB      *db;
        int i;
        int rc;
@@ -407,6 +458,8 @@ equality_candidates(
                        ava->aa_desc->ad_cname.bv_val, 0, 0 );
 #endif
 
+       BDB_IDL_ALL( bdb, ids );
+
        rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,
                &db, &mask, &prefix );
 
@@ -422,7 +475,7 @@ equality_candidates(
                        "index_param failed (%d)\n",
                        ava->aa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if ( db == NULL ) {
@@ -435,16 +488,16 @@ equality_candidates(
                        "<= bdb_equality_candidates: (%s) not indexed\n", 
                        ava->aa_desc->ad_cname.bv_val, 0, 0 );
 #endif
-               return -1;
+               return 0;
        }
 
        mr = ava->aa_desc->ad_type->sat_equality;
        if( !mr ) {
-               return -1;
+               return 0;
        }
 
        if( !mr->smr_filter ) {
-               return -1;
+               return 0;
        }
 
        rc = (mr->smr_filter)(
@@ -468,7 +521,7 @@ equality_candidates(
                        "MR filter failed (%d)\n",
                        prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
 #endif
-               return rc;
+               return 0;
        }
 
        if( keys == NULL ) {
@@ -555,6 +608,7 @@ approx_candidates(
        ID *ids,
        ID *tmp )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        DB      *db;
        int i;
        int rc;
@@ -571,6 +625,8 @@ approx_candidates(
                        ava->aa_desc->ad_cname.bv_val, 0, 0 );
 #endif
 
+       BDB_IDL_ALL( bdb, ids );
+
        rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_APPROX,
                &db, &mask, &prefix );
 
@@ -586,7 +642,7 @@ approx_candidates(
                        "index_param failed (%d)\n",
                        ava->aa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if ( db == NULL ) {
@@ -599,7 +655,7 @@ approx_candidates(
                        "<= bdb_approx_candidates: (%s) not indexed\n",
                        ava->aa_desc->ad_cname.bv_val, 0, 0 );
 #endif
-               return -1;
+               return 0;
        }
 
        mr = ava->aa_desc->ad_type->sat_approx;
@@ -609,11 +665,11 @@ approx_candidates(
        }
 
        if( !mr ) {
-               return -1;
+               return 0;
        }
 
        if( !mr->smr_filter ) {
-               return -1;
+               return 0;
        }
 
        rc = (mr->smr_filter)(
@@ -637,7 +693,7 @@ approx_candidates(
                        "MR filter failed (%d)\n",
                        prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
 #endif
-               return rc;
+               return 0;
        }
 
        if( keys == NULL ) {
@@ -722,6 +778,7 @@ substring_candidates(
        ID *ids,
        ID *tmp )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        DB      *db;
        int i;
        int rc;
@@ -738,6 +795,8 @@ substring_candidates(
                        sub->sa_desc->ad_cname.bv_val, 0, 0 );
 #endif
 
+       BDB_IDL_ALL( bdb, ids );
+
        rc = bdb_index_param( op->o_bd, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,
                &db, &mask, &prefix );
 
@@ -753,7 +812,7 @@ substring_candidates(
                        "index_param failed (%d)\n",
                        sub->sa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if ( db == NULL ) {
@@ -766,17 +825,17 @@ substring_candidates(
                        "<= bdb_substring_candidates: (%s) not indexed\n",
                        sub->sa_desc->ad_cname.bv_val, 0, 0 );
 #endif
-               return -1;
+               return 0;
        }
 
        mr = sub->sa_desc->ad_type->sat_substr;
 
        if( !mr ) {
-               return -1;
+               return 0;
        }
 
        if( !mr->smr_filter ) {
-               return -1;
+               return 0;
        }
 
        rc = (mr->smr_filter)(
@@ -800,7 +859,7 @@ substring_candidates(
                        "MR filter failed (%d)\n",
                        sub->sa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if( keys == NULL ) {
@@ -875,6 +934,6 @@ substring_candidates(
                (long) BDB_IDL_FIRST(ids),
                (long) BDB_IDL_LAST(ids) );
 #endif
-       return( 0 );
+       return( rc );
 }