add Time subsystem

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index d960ac3209887c846c45cbbf501458876ad6020e..94724f8da5c3604e3e357ca34794411de5b19df3 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -1,7 +1,7 @@
 /* filterentry.c - apply a filter to an entry */
 /* $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
  */
 
@@ -184,7 +184,6 @@ test_filter(
                }
                break;
 
-#ifdef SLAPD_EXT_FILTERS
        case LDAP_FILTER_EXT:
 #ifdef NEW_LOGGING
                LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
@@ -195,7 +194,6 @@ test_filter(
 
                rc = test_mra_filter( be, conn, op, e, f->f_mra );
                break;
-#endif
 
        default:
 #ifdef NEW_LOGGING
@@ -220,6 +218,59 @@ test_filter(
        return( rc );
 }
 
+static int test_mra_filter(
+       Backend *be,
+       Connection *conn,
+       Operation *op,
+       Entry *e,
+       MatchingRuleAssertion *mra )
+{
+       Attribute       *a;
+
+       if( !access_allowed( be, conn, op, e,
+               mra->ma_desc, &mra->ma_value, ACL_SEARCH ) )
+       {
+               return LDAP_INSUFFICIENT_ACCESS;
+       }
+
+       if( strcmp(mra->ma_rule->smr_syntax->ssyn_oid,
+               mra->ma_desc->ad_type->sat_syntax->ssyn_oid) != 0)
+       {
+               return LDAP_INVALID_SYNTAX;
+       }
+
+       if( mra->ma_rule == NULL )
+       {
+               return LDAP_INAPPROPRIATE_MATCHING;
+       }
+
+       for(a = attrs_find( e->e_attrs, mra->ma_desc );
+               a != NULL;
+               a = attrs_find( a->a_next, mra->ma_desc ) )
+       {
+               struct berval *bv;
+               for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+                       int ret;
+                       int rc;
+                       const char *text;
+
+                       rc = value_match( &ret, a->a_desc, mra->ma_rule,
+                               SLAP_MR_ASSERTION_SYNTAX_MATCH,
+                               bv, &mra->ma_value,
+                               &text );
+
+                       if( rc != LDAP_SUCCESS ) {
+                               return rc;
+                       }
+
+                       if ( ret ) {
+                               return LDAP_COMPARE_TRUE;
+                       }
+               }
+       }
+
+       return LDAP_COMPARE_FALSE;
+}
 
 static int
 test_ava_filter(
@@ -231,11 +282,10 @@ test_ava_filter(
     int                type
 )
 {
-       int             i;
        Attribute       *a;
 
        if ( !access_allowed( be, conn, op, e,
-               ava->aa_desc, ava->aa_value, ACL_SEARCH ) )
+               ava->aa_desc, &ava->aa_value, ACL_SEARCH ) )
        {
                return LDAP_INSUFFICIENT_ACCESS;
        }
@@ -245,6 +295,7 @@ test_ava_filter(
                a = attrs_find( a->a_next, ava->aa_desc ) )
        {
                MatchingRule *mr;
+               struct berval *bv;
 
                switch ( type ) {
                case LDAP_FILTER_APPROX:
@@ -270,14 +321,14 @@ test_ava_filter(
                        continue;
                }
 
-               for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+               for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
                        int ret;
                        int rc;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr, 0,
-                               a->a_vals[i], ava->aa_value,
-                               &text );
+                       rc = value_match( &ret, a->a_desc, mr,
+                               SLAP_MR_ASSERTION_SYNTAX_MATCH,
+                               bv, &ava->aa_value, &text );
 
                        if( rc != LDAP_SUCCESS ) {
                                return rc;
@@ -449,21 +500,21 @@ test_substrings_filter(
                a != NULL;
                a = attrs_find( a->a_next, f->f_sub_desc ) )
        {
-               int i;
                MatchingRule *mr = a->a_desc->ad_type->sat_substr;
+               struct berval *bv;
 
                if( mr == NULL ) {
                        continue;
                }
 
-               for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+               for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
                        int ret;
                        int rc;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr, 0,
-                               a->a_vals[i], f->f_sub,
-                               &text );
+                       rc = value_match( &ret, a->a_desc, mr,
+                               SLAP_MR_ASSERTION_SYNTAX_MATCH,
+                               bv, f->f_sub, &text );
 
                        if( rc != LDAP_SUCCESS ) {
                                return rc;