Extend checks to substrings rules. Need to kludge around

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 01a89c4f45e8945868c3e9fd4f45b2dbcbe59edf..82cd8cd327609843b92086015f996087657a0c5b 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -215,13 +215,6 @@ static int test_mra_filter(
 {
        Attribute       *a;
 
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
-       if( !access_allowed( be, conn, op, e,
-               mra->ma_desc, &mra->ma_value, ACL_SEARCH, NULL ) )
-       {
-               return LDAP_INSUFFICIENT_ACCESS;
-       }
-#else /* SLAP_X_MRA_MATCH_DNATTRS */
        if ( mra->ma_desc ) {
                /*
                 * if ma_desc is available, then we're filtering for
@@ -233,7 +226,6 @@ static int test_mra_filter(
                {
                        return LDAP_INSUFFICIENT_ACCESS;
                }
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
 
                for(a = attrs_find( e->e_attrs, mra->ma_desc );
                        a != NULL;
@@ -258,7 +250,6 @@ static int test_mra_filter(
                                }
                        }
                }
-#ifdef SLAP_X_MRA_MATCH_DNATTRS
        } else {
 
                /*
@@ -380,7 +371,6 @@ static int test_mra_filter(
                        }
                }
        }
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
 
        return LDAP_COMPARE_FALSE;
 }