Fix ITS#3424

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 9092a5951b06c44ab2466cd65498be4c32e0ca48..ec4ce226b67cc11eb3098430dcd3c4a68bb541f0 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -163,13 +163,6 @@ static int test_mra_filter(
                memfree = op->o_tmpfree;
        }
 
-#ifdef LDAP_COMP_MATCH
-       /* Component Matching */
-       if( mra->ma_cf && mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) {
-               return test_comp_filter_entry( op, e, mra );
-       }
-#endif
-
        if ( mra->ma_desc ) {
                /*
                 * if ma_desc is available, then we're filtering for
@@ -189,6 +182,7 @@ static int test_mra_filter(
                        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;
@@ -213,9 +207,20 @@ static int test_mra_filter(
                                int rc;
                                const char *text;
        
-                               rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
-                                       bv, &mra->ma_value, &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 );
+                               }
+
                                if( rc != LDAP_SUCCESS ) return rc;
                                if ( ret == 0 ) return LDAP_COMPARE_TRUE;
                        }
@@ -258,9 +263,20 @@ static int test_mra_filter(
                        for ( ; bv->bv_val != NULL; bv++ ) {
                                int ret;
        
-                               rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
-                                       bv, &value, &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, &value, &text );
+                               }
+
                                if( rc != LDAP_SUCCESS ) break;
        
                                if ( ret == 0 ) {
@@ -333,7 +349,6 @@ static int test_mra_filter(
                                /* 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 );
                                }