]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/filterentry.c
remove a componentCertificate attribute from the organizationalPerson objectclass
[openldap] / servers / slapd / filterentry.c
index 551f21c3d7a3fafea34db36d15811f0d305114ca..fc090eb3fc977a3a4d71fc54a84e4dac0f75305c 100644 (file)
@@ -1,8 +1,27 @@
 /* filterentry.c - apply a filter to an entry */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
 
 #include "slap.h"
 
-static int     test_filter_and( Backend *be,
-       Connection *conn, Operation *op,
-       Entry *e, Filter *flist );
-static int     test_filter_or( Backend *be,
-       Connection *conn, Operation *op,
-       Entry *e, Filter *flist );
-static int     test_substrings_filter( Backend *be,
-       Connection *conn, Operation *op,
-       Entry *e, Filter *f);
-static int     test_ava_filter( Backend *be,
-       Connection *conn, Operation *op,
+static int     test_filter_and( Operation *op, Entry *e, Filter *flist );
+static int     test_filter_or( Operation *op, Entry *e, Filter *flist );
+static int     test_substrings_filter( Operation *op, Entry *e, Filter *f);
+static int     test_ava_filter( Operation *op,
        Entry *e, AttributeAssertion *ava, int type );
-static int     test_mra_filter( Backend *be,
-       Connection *conn, Operation *op,
+static int     test_mra_filter( Operation *op,
        Entry *e, MatchingRuleAssertion *mra );
-static int     test_presence_filter( Backend *be,
-       Connection *conn, Operation *op,
+static int     test_presence_filter( Operation *op,
        Entry *e, AttributeDescription *desc );
 
 
@@ -46,15 +56,11 @@ static int  test_presence_filter( Backend *be,
 
 int
 test_filter(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
     Entry      *e,
-    Filter     *f
-)
+    Filter     *f )
 {
        int     rc;
-
        Debug( LDAP_DEBUG_FILTER, "=> test_filter\n", 0, 0, 0 );
 
        switch ( f->f_choice ) {
@@ -64,55 +70,57 @@ test_filter(
                        f->f_result == LDAP_COMPARE_TRUE ? "true" :
                        f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" : "error",
                        f->f_result, 0 );
+
                rc = f->f_result;
                break;
 
        case LDAP_FILTER_EQUALITY:
                Debug( LDAP_DEBUG_FILTER, "    EQUALITY\n", 0, 0, 0 );
-               rc = test_ava_filter( be, conn, op, e, f->f_ava,
-                   LDAP_FILTER_EQUALITY );
+               rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_EQUALITY );
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
                Debug( LDAP_DEBUG_FILTER, "    SUBSTRINGS\n", 0, 0, 0 );
-               rc = test_substrings_filter( be, conn, op, e, f );
+               rc = test_substrings_filter( op, e, f );
                break;
 
        case LDAP_FILTER_GE:
-               rc = test_ava_filter( be, conn, op, e, f->f_ava,
-                   LDAP_FILTER_GE );
+               Debug( LDAP_DEBUG_FILTER, "    GE\n", 0, 0, 0 );
+               rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_GE );
                break;
 
        case LDAP_FILTER_LE:
-               rc = test_ava_filter( be, conn, op, e, f->f_ava,
-                   LDAP_FILTER_LE );
+               Debug( LDAP_DEBUG_FILTER, "    LE\n", 0, 0, 0 );
+               rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_LE );
                break;
 
        case LDAP_FILTER_PRESENT:
                Debug( LDAP_DEBUG_FILTER, "    PRESENT\n", 0, 0, 0 );
-               rc = test_presence_filter( be, conn, op, e, f->f_desc );
+               rc = test_presence_filter( op, e, f->f_desc );
                break;
 
        case LDAP_FILTER_APPROX:
                Debug( LDAP_DEBUG_FILTER, "    APPROX\n", 0, 0, 0 );
-               rc = test_ava_filter( be, conn, op, e, f->f_ava,
-                   LDAP_FILTER_APPROX );
+               rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_APPROX );
                break;
 
        case LDAP_FILTER_AND:
                Debug( LDAP_DEBUG_FILTER, "    AND\n", 0, 0, 0 );
-               rc = test_filter_and( be, conn, op, e, f->f_and );
+               rc = test_filter_and( op, e, f->f_and );
                break;
 
        case LDAP_FILTER_OR:
                Debug( LDAP_DEBUG_FILTER, "    OR\n", 0, 0, 0 );
-               rc = test_filter_or( be, conn, op, e, f->f_or );
+               rc = test_filter_or( op, e, f->f_or );
                break;
 
        case LDAP_FILTER_NOT:
                Debug( LDAP_DEBUG_FILTER, "    NOT\n", 0, 0, 0 );
-               rc = test_filter( be, conn, op, e, f->f_not );
+               rc = test_filter( op, e, f->f_not );
 
+               /* Flip true to false and false to true
+                * but leave Undefined alone.
+                */
                switch( rc ) {
                case LDAP_COMPARE_TRUE:
                        rc = LDAP_COMPARE_FALSE;
@@ -123,12 +131,10 @@ test_filter(
                }
                break;
 
-#ifdef SLAPD_EXT_FILTERS
        case LDAP_FILTER_EXT:
                Debug( LDAP_DEBUG_FILTER, "    EXT\n", 0, 0, 0 );
-               rc = test_mra_filter( be, conn, op, e, f->f_mra );
+               rc = test_mra_filter( op, e, f->f_mra );
                break;
-#endif
 
        default:
                Debug( LDAP_DEBUG_ANY, "    unknown filter type %lu\n",
@@ -140,31 +146,314 @@ test_filter(
        return( rc );
 }
 
+static int test_mra_filter(
+       Operation *op,
+       Entry *e,
+       MatchingRuleAssertion *mra )
+{
+       Attribute       *a;
+       void            *memctx;
+       BER_MEMFREE_FN  *memfree;
+
+       if ( op == NULL ) {
+               memctx = NULL;
+               memfree = slap_sl_free;
+       } else {
+               memctx = op->o_tmpmemctx;
+               memfree = op->o_tmpfree;
+       }
+
+       if ( mra->ma_desc ) {
+               /*
+                * if ma_desc is available, then we're filtering for
+                * one attribute, and SEARCH permissions can be checked
+                * directly.
+                */
+               if( !access_allowed( op, e,
+                       mra->ma_desc, &mra->ma_value, ACL_SEARCH, NULL ) )
+               {
+                       return LDAP_INSUFFICIENT_ACCESS;
+               }
+
+               if ( mra->ma_desc == slap_schema.si_ad_entryDN ) {
+                       int ret, rc;
+                       const char *text;
+
+                       rc = value_match( &ret, slap_schema.si_ad_entryDN, mra->ma_rule,
+                               0, &e->e_nname, &mra->ma_value, &text );
+       
+       
+                       if( rc != LDAP_SUCCESS ) return rc;
+                       if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+                       return LDAP_COMPARE_FALSE;
+               }
+
+               for(a = attrs_find( e->e_attrs, mra->ma_desc );
+                       a != NULL;
+                       a = attrs_find( a->a_next, mra->ma_desc ) )
+               {
+                       struct berval *bv;
+                       /* If ma_rule is not the same as the attribute's
+                        * normal rule, then we can't use the a_nvals.
+                        */
+                       if (mra->ma_rule == a->a_desc->ad_type->sat_equality) {
+                               bv = a->a_nvals;
+                       } else {
+                               bv = a->a_vals;
+                       }
+
+                       for ( ; bv->bv_val != NULL; bv++ ) {
+                               int ret;
+                               int rc;
+                               const char *text;
+       
+#ifdef LDAP_COMP_MATCH
+       /* Component Matching */
+               if( mra->ma_cf && mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) {
+                               rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+                                       (struct berval *)a,(void*) mra , &text );
+               }
+               else {
+#endif
+                               rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+                                       bv, &mra->ma_value, &text );
+#ifdef LDAP_COMP_MATCH
+               }
+#endif
+                               if( rc != LDAP_SUCCESS ) return rc;
+                               if ( ret == 0 ) return LDAP_COMPARE_TRUE;
+                       }
+               }
+
+       } else {
+               /*
+                * No attribute description: test all
+                */
+               for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+                       struct berval   *bv, value;
+                       const char      *text = NULL;
+                       int             rc;
+
+                       /* check if matching is appropriate */
+                       if ( !mr_usable_with_at( mra->ma_rule, a->a_desc->ad_type )) {
+                               continue;
+                       }
+
+                       /* normalize for equality */
+                       rc = asserted_value_validate_normalize( a->a_desc, mra->ma_rule,
+                               SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+                               &mra->ma_value, &value, &text, memctx );
+                       if ( rc != LDAP_SUCCESS ) continue;
+
+                       /* check search access */
+                       if ( !access_allowed( op, e,
+                               a->a_desc, &value, ACL_SEARCH, NULL ) ) {
+                               memfree( value.bv_val, memctx );
+                               continue;
+                       }
+
+                       /* check match */
+                       if (mra->ma_rule == a->a_desc->ad_type->sat_equality) {
+                               bv = a->a_nvals;
+                       } else {
+                               bv = a->a_vals;
+                       }
+
+                       for ( ; bv->bv_val != NULL; bv++ ) {
+                               int ret;
+       
+#ifdef LDAP_COMP_MATCH
+       /* Component Matching */
+                       if( mra->ma_cf &&
+                                       mra->ma_rule->smr_usage & SLAP_MR_COMPONENT) {
+                               rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+                                       (struct berval*)a, (void*)mra, &text );
+                       }
+                       else {
+#endif
+                               rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+                                       bv, &value, &text );
+       
+#ifdef LDAP_COMP_MATCH
+                       }
+#endif
+                               if( rc != LDAP_SUCCESS ) break;
+       
+                               if ( ret == 0 ) {
+                                       rc = LDAP_COMPARE_TRUE;
+                                       break;
+                               }
+                       }
+                       memfree( value.bv_val, memctx );
+                       if ( rc != LDAP_SUCCESS ) return rc;
+               }
+       }
+
+       /* check attrs in DN AVAs if required */
+       if ( mra->ma_dnattrs ) {
+               LDAPDN          dn = NULL;
+               int             iRDN, iAVA;
+               int             rc;
+
+               /* parse and pretty the dn */
+               rc = dnPrettyDN( NULL, &e->e_name, &dn, memctx );
+               if ( rc != LDAP_SUCCESS ) {
+                       return LDAP_INVALID_SYNTAX;
+               }
+
+               /* for each AVA of each RDN ... */
+               for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
+                       LDAPRDN         rdn = dn[ iRDN ];
+
+                       for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
+                               LDAPAVA         *ava = rdn[ iAVA ];
+                               struct berval   *bv = &ava->la_value, value;
+                               AttributeDescription *ad =
+                                       (AttributeDescription *)ava->la_private;
+                               int ret;
+                               const char *text;
+
+                               assert( ad );
+
+                               if ( mra->ma_desc ) {
+                                       /* have a mra type? check for subtype */
+                                       if ( !is_ad_subtype( ad, mra->ma_desc ) ) {
+                                               continue;
+                                       }
+                                       value = mra->ma_value;
+
+                               } else {
+                                       const char      *text = NULL;
+
+                                       /* check if matching is appropriate */
+                                       if ( !mr_usable_with_at( mra->ma_rule, ad->ad_type )) {
+                                               continue;
+                                       }
+
+                                       /* normalize for equality */
+                                       rc = asserted_value_validate_normalize( ad,
+                                               mra->ma_rule,
+                                               SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+                                               &mra->ma_value, &value, &text, memctx );
+                                       if ( rc != LDAP_SUCCESS ) continue;
+
+                                       /* check search access */
+                                       if ( !access_allowed( op, e,
+                                               ad, &value, ACL_SEARCH, NULL ) )
+                                       {
+                                               memfree( value.bv_val, memctx );
+                                               continue;
+                                       }
+                               }
+
+                               /* check match */
+                               rc = value_match( &ret, ad, mra->ma_rule, 0,
+                                       bv, &value, &text );
+                               if ( value.bv_val != mra->ma_value.bv_val ) {
+                                       memfree( value.bv_val, memctx );
+                               }
+
+                               if ( rc == LDAP_SUCCESS && ret == 0 ) rc = LDAP_COMPARE_TRUE;
+
+                               if( rc != LDAP_SUCCESS ) {
+                                       ldap_dnfree_x( dn, memctx );
+                                       return rc;
+                               }
+                       }
+               }
+               ldap_dnfree_x( dn, memctx );
+       }
+
+       return LDAP_COMPARE_FALSE;
+}
 
 static int
 test_ava_filter(
-    Backend    *be,
-    Connection *conn,
-    Operation  *op,
-    Entry      *e,
+       Operation       *op,
+       Entry           *e,
        AttributeAssertion *ava,
-    int                type
-)
+       int             type )
 {
-       int             i;
+       int rc;
        Attribute       *a;
 
-       if ( be != NULL && ! access_allowed( be, conn, op, e,
-               ava->aa_desc, ava->aa_value, ACL_SEARCH ) )
+       if ( !access_allowed( op, e,
+               ava->aa_desc, &ava->aa_value, ACL_SEARCH, NULL ) )
        {
                return LDAP_INSUFFICIENT_ACCESS;
        }
 
+       if ( ava->aa_desc == slap_schema.si_ad_hasSubordinates 
+               && op && op->o_bd && op->o_bd->be_has_subordinates )
+       {
+               int     hasSubordinates;
+               struct berval hs;
+
+               if( type != LDAP_FILTER_EQUALITY &&
+                       type != LDAP_FILTER_APPROX )
+               {
+                       /* No other match is allowed */
+                       return LDAP_INAPPROPRIATE_MATCHING;
+               }
+               
+               if ( op->o_bd->be_has_subordinates( op, e, &hasSubordinates ) !=
+                       LDAP_SUCCESS )
+               {
+                       return LDAP_OTHER;
+               }
+
+               if ( hasSubordinates == LDAP_COMPARE_TRUE ) {
+                       hs = slap_true_bv;
+
+               } else if ( hasSubordinates == LDAP_COMPARE_FALSE ) {
+                       hs = slap_false_bv;
+
+               } else {
+                       return LDAP_OTHER;
+               }
+
+               if ( bvmatch( &ava->aa_value, &hs ) ) return LDAP_COMPARE_TRUE;
+               return LDAP_COMPARE_FALSE;
+       }
+
+       if ( ava->aa_desc == slap_schema.si_ad_entryDN ) {
+               MatchingRule *mr;
+               int rc, match;
+               const char *text;
+
+               if( type != LDAP_FILTER_EQUALITY &&
+                       type != LDAP_FILTER_APPROX )
+               {
+                       /* No other match is allowed */
+                       return LDAP_INAPPROPRIATE_MATCHING;
+               }
+
+               mr = slap_schema.si_ad_entryDN->ad_type->sat_equality;
+               assert( mr );
+
+               rc = value_match( &match, slap_schema.si_ad_entryDN, mr, 0,
+                       &e->e_nname, &ava->aa_value, &text );
+
+               if( rc != LDAP_SUCCESS ) return rc;
+               if( match == 0 ) return LDAP_COMPARE_TRUE;
+               return LDAP_COMPARE_FALSE;
+       }
+
+       rc = LDAP_COMPARE_FALSE;
+
        for(a = attrs_find( e->e_attrs, ava->aa_desc );
                a != NULL;
                a = attrs_find( a->a_next, ava->aa_desc ) )
        {
                MatchingRule *mr;
+               struct berval *bv;
+
+               if (( ava->aa_desc != a->a_desc ) && !access_allowed( op,
+                       e, a->a_desc, &ava->aa_value, ACL_SEARCH, NULL ))
+               {
+                       rc = LDAP_INSUFFICIENT_ACCESS;
+                       continue;
+               }
 
                switch ( type ) {
                case LDAP_FILTER_APPROX:
@@ -187,121 +476,151 @@ test_ava_filter(
                }
 
                if( mr == NULL ) {
+                       rc = LDAP_INAPPROPRIATE_MATCHING;
                        continue;
                }
 
-               for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-                       int ret;
-                       int rc;
+               for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
+                       int ret, match;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr, 0,
-                               a->a_vals[i], ava->aa_value,
-                               &text );
+                       ret = value_match( &match, a->a_desc, mr, 0,
+                               bv, &ava->aa_value, &text );
 
-                       if( rc != LDAP_SUCCESS ) {
-                               return rc;
+                       if( ret != LDAP_SUCCESS ) {
+                               rc = ret;
+                               break;
                        }
 
                        switch ( type ) {
                        case LDAP_FILTER_EQUALITY:
                        case LDAP_FILTER_APPROX:
-                               if ( ret == 0 ) {
-                                       return LDAP_COMPARE_TRUE;
-                               }
+                               if ( match == 0 ) return LDAP_COMPARE_TRUE;
                                break;
 
                        case LDAP_FILTER_GE:
-                               if ( ret >= 0 ) {
-                                       return LDAP_COMPARE_TRUE;
-                               }
+                               if ( match >= 0 ) return LDAP_COMPARE_TRUE;
                                break;
 
                        case LDAP_FILTER_LE:
-                               if ( ret <= 0 ) {
-                                       return LDAP_COMPARE_TRUE;
-                               }
+                               if ( match <= 0 ) return LDAP_COMPARE_TRUE;
                                break;
                        }
                }
        }
 
-       return( LDAP_COMPARE_FALSE );
+       return rc;
 }
 
 
 static int
 test_presence_filter(
-    Backend    *be,
-    Connection *conn,
-    Operation  *op,
-    Entry      *e,
-       AttributeDescription *desc
-)
+       Operation       *op,
+       Entry           *e,
+       AttributeDescription *desc )
 {
-       if ( be != NULL && ! access_allowed( be, conn, op, e,
-               desc, NULL, ACL_SEARCH ) )
-       {
+       Attribute       *a;
+       int rc;
+
+       if ( !access_allowed( op, e, desc, NULL, ACL_SEARCH, NULL ) ) {
                return LDAP_INSUFFICIENT_ACCESS;
        }
 
-       return attrs_find( e->e_attrs, desc ) != NULL
-               ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
+       if ( desc == slap_schema.si_ad_hasSubordinates ) {
+               /*
+                * XXX: fairly optimistic: if the function is defined,
+                * then PRESENCE must succeed, because hasSubordinate
+                * is boolean-valued; I think we may live with this 
+                * simplification by now
+                */
+               if ( op && op->o_bd && op->o_bd->be_has_subordinates ) {
+                       return LDAP_COMPARE_TRUE;
+               }
+
+               return LDAP_COMPARE_FALSE;
+       }
+
+       if ( desc == slap_schema.si_ad_entryDN ||
+               desc == slap_schema.si_ad_subschemaSubentry )
+       {
+               /* entryDN and subschemaSubentry are always present */
+               return LDAP_COMPARE_TRUE;
+       }
+
+       rc = LDAP_COMPARE_FALSE;
+
+       for(a = attrs_find( e->e_attrs, desc );
+               a != NULL;
+               a = attrs_find( a->a_next, desc ) )
+       {
+               if (( desc != a->a_desc ) && !access_allowed( op,
+                       e, a->a_desc, NULL, ACL_SEARCH, NULL ))
+               {
+                       rc = LDAP_INSUFFICIENT_ACCESS;
+                       continue;
+               }
+
+               rc = LDAP_COMPARE_TRUE;
+               break;
+       }
+
+       return rc;
 }
 
 
 static int
 test_filter_and(
-    Backend    *be,
-    Connection *conn,
-    Operation  *op,
-    Entry      *e,
-    Filter     *flist
-)
+       Operation       *op,
+       Entry   *e,
+       Filter  *flist )
 {
        Filter  *f;
-       int rtn = LDAP_COMPARE_TRUE;
+       int rtn = LDAP_COMPARE_TRUE; /* True if empty */
 
        Debug( LDAP_DEBUG_FILTER, "=> test_filter_and\n", 0, 0, 0 );
 
        for ( f = flist; f != NULL; f = f->f_next ) {
-               int rc = test_filter( be, conn, op, e, f );
+               int rc = test_filter( op, e, f );
 
                if ( rc == LDAP_COMPARE_FALSE ) {
-                       rtn = LDAP_COMPARE_FALSE;
+                       /* filter is False */
+                       rtn = rc;
                        break;
                }
+
                if ( rc != LDAP_COMPARE_TRUE ) {
+                       /* filter is Undefined unless later elements are False */
                        rtn = rc;
                }
        }
 
        Debug( LDAP_DEBUG_FILTER, "<= test_filter_and %d\n", rtn, 0, 0 );
+
        return rtn;
 }
 
 static int
 test_filter_or(
-    Backend    *be,
-    Connection *conn,
-    Operation  *op,
-    Entry      *e,
-    Filter     *flist
-)
+       Operation       *op,
+       Entry   *e,
+       Filter  *flist )
 {
        Filter  *f;
-       int rtn = LDAP_COMPARE_FALSE;
+       int rtn = LDAP_COMPARE_FALSE; /* False if empty */
 
        Debug( LDAP_DEBUG_FILTER, "=> test_filter_or\n", 0, 0, 0 );
 
        for ( f = flist; f != NULL; f = f->f_next ) {
-               int rc = test_filter( be, conn, op, e, f );
+               int rc = test_filter( op, e, f );
 
                if ( rc == LDAP_COMPARE_TRUE ) {
-                       rtn = LDAP_COMPARE_TRUE;
+                       /* filter is True */
+                       rtn = rc;
                        break;
                }
-               if ( rc != LDAP_COMPARE_TRUE ) {
+
+               if ( rc != LDAP_COMPARE_FALSE ) {
+                       /* filter is Undefined unless later elements are True */
                        rtn = rc;
                }
        }
@@ -313,53 +632,59 @@ test_filter_or(
 
 static int
 test_substrings_filter(
-    Backend    *be,
-    Connection *conn,
-    Operation  *op,
-    Entry      *e,
-    Filter     *f
-)
+       Operation       *op,
+       Entry   *e,
+       Filter  *f )
 {
        Attribute       *a;
+       int rc;
 
        Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
 
-       if ( be != NULL && ! access_allowed( be, conn, op, e,
-               f->f_sub_desc, NULL, ACL_SEARCH ) )
+       if ( !access_allowed( op, e,
+               f->f_sub_desc, NULL, ACL_SEARCH, NULL ) )
        {
                return LDAP_INSUFFICIENT_ACCESS;
        }
 
+       rc = LDAP_COMPARE_FALSE;
+
        for(a = attrs_find( e->e_attrs, f->f_sub_desc );
                a != NULL;
                a = attrs_find( a->a_next, f->f_sub_desc ) )
        {
-               int i;
-               MatchingRule *mr = a->a_desc->ad_type->sat_substr;
+               MatchingRule *mr;
+               struct berval *bv;
 
+               if (( f->f_sub_desc != a->a_desc ) && !access_allowed( op,
+                       e, a->a_desc, NULL, ACL_SEARCH, NULL ))
+               {
+                       rc = LDAP_INSUFFICIENT_ACCESS;
+                       continue;
+               }
+
+               mr = a->a_desc->ad_type->sat_substr;
                if( mr == NULL ) {
+                       rc = LDAP_INAPPROPRIATE_MATCHING;
                        continue;
                }
 
-               for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-                       int ret;
-                       int rc;
+               for ( bv = a->a_nvals; bv->bv_val != NULL; bv++ ) {
+                       int ret, match;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr, 0,
-                               a->a_vals[i], f->f_sub,
-                               &text );
+                       ret = value_match( &match, a->a_desc, mr, 0,
+                               bv, f->f_sub, &text );
 
-                       if( rc != LDAP_SUCCESS ) {
-                               return rc;
-                       }
-
-                       if ( ret == 0 ) {
-                               return LDAP_COMPARE_TRUE;
+                       if( ret != LDAP_SUCCESS ) {
+                               rc = ret;
+                               break;
                        }
+                       if ( match == 0 ) return LDAP_COMPARE_TRUE;
                }
        }
 
-       Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n", 0, 0, 0 );
-       return LDAP_COMPARE_FALSE;
+       Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter %d\n",
+               rc, 0, 0 );
+       return rc;
 }