Use defined Root DSE attributes.

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 7011299eb74d99e829a1f5e68f43a1b57614b65b..3f5ec48ab916303531336256be802d506b300ec2 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -15,8 +15,6 @@
 
 #include "slap.h"
 
-#define SLAPD_EXT_FILTERS 1
-
 static int     test_filter_and( Backend *be,
        Connection *conn, Operation *op,
        Entry *e, Filter *flist );
@@ -186,7 +184,6 @@ test_filter(
                }
                break;
 
-#ifdef SLAPD_EXT_FILTERS
        case LDAP_FILTER_EXT:
 #ifdef NEW_LOGGING
                LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
@@ -197,7 +194,6 @@ test_filter(
 
                rc = test_mra_filter( be, conn, op, e, f->f_mra );
                break;
-#endif
 
        default:
 #ifdef NEW_LOGGING
@@ -258,7 +254,8 @@ static int test_mra_filter(
                        int rc;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
+                       rc = value_match( &ret, a->a_desc, mra->ma_rule,
+                               SLAP_MR_VALUE_IS_IN_MR_SYNTAX,
                                a->a_vals[i], mra->ma_value,
                                &text );
 
@@ -329,7 +326,8 @@ test_ava_filter(
                        int rc;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr, 0,
+                       rc = value_match( &ret, a->a_desc, mr,
+                               SLAP_MR_VALUE_IS_IN_MR_SYNTAX,
                                a->a_vals[i], ava->aa_value,
                                &text );
 
@@ -515,7 +513,8 @@ test_substrings_filter(
                        int rc;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr, 0,
+                       rc = value_match( &ret, a->a_desc, mr,
+                               SLAP_MR_VALUE_IS_IN_MR_SYNTAX,
                                a->a_vals[i], f->f_sub,
                                &text );