unifdef -DSLAP_X_MRA_MATCH_DNATTRS

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index a068b74fd19eab8ce219ef1d17955d1ecb27d277..4582be62bb2d2acb3b97fae0e9e012395a03073e 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -742,24 +742,9 @@ filter2bv( Filter *f, struct berval *fstr )
 
                break;
 
-       case LDAP_FILTER_EXT:
-               filter_escape_value( &f->f_mr_value, &tmp );
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
-               fstr->bv_len = f->f_mr_desc->ad_cname.bv_len +
-                       ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
-                       ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
-                       tmp.bv_len + ( sizeof("(:=)") - 1 );
-               fstr->bv_val = malloc( fstr->bv_len + 1 );
-
-               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
-                       f->f_mr_desc->ad_cname.bv_val,
-                       f->f_mr_dnattrs ? ":dn" : "",
-                       f->f_mr_rule_text.bv_len ? ":" : "",
-                       f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
-                       tmp.bv_val );
-#else /* SLAP_X_MRA_MATCH_DNATTRS */
-               {
+       case LDAP_FILTER_EXT: {
                struct berval ad;
+               filter_escape_value( &f->f_mr_value, &tmp );
 
                if ( f->f_mr_desc ) {
                        ad = f->f_mr_desc->ad_cname;
@@ -780,10 +765,8 @@ filter2bv( Filter *f, struct berval *fstr )
                        f->f_mr_rule_text.bv_len ? ":" : "",
                        f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
                        tmp.bv_val );
-               }
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
                ber_memfree( tmp.bv_val );
-               break;
+               } break;
 
        case SLAPD_FILTER_COMPUTED:
                ber_str2bv(
@@ -1308,25 +1291,9 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr )
                        f->f_desc->ad_cname.bv_val );
                break;
 
-       case LDAP_FILTER_EXT:
-               filter_escape_value( &f->f_mr_value, &tmp );
-
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
-               fstr->bv_len = f->f_mr_desc->ad_cname.bv_len +
-                       ( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
-                       ( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
-                       tmp.bv_len + ( sizeof("(:=)") - 1 );
-               fstr->bv_val = malloc( fstr->bv_len + 1 );
-
-               snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
-                       f->f_mr_desc->ad_cname.bv_val,
-                       f->f_mr_dnattrs ? ":dn" : "",
-                       f->f_mr_rule_text.bv_len ? ":" : "",
-                       f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
-                       tmp.bv_val );
-#else /* SLAP_X_MRA_MATCH_DNATTRS */
-               {
+       case LDAP_FILTER_EXT: {
                struct berval ad;
+               filter_escape_value( &f->f_mr_value, &tmp );
 
                if ( f->f_mr_desc ) {
                        ad = f->f_mr_desc->ad_cname;
@@ -1347,11 +1314,9 @@ simple_vrFilter2bv( ValuesReturnFilter *f, struct berval *fstr )
                        f->f_mr_rule_text.bv_len ? ":" : "",
                        f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
                        tmp.bv_val );
-               }
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
 
                ber_memfree( tmp.bv_val );
-               break;
+               } break;
 
        case SLAPD_FILTER_COMPUTED:
                ber_str2bv(

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;
 }

diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index 53d16b45726707f7a5942629eba2080777cb29c4..0d3986ae2b4f8da8397134954c7318c0aa11a067 100644 (file)
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -358,13 +358,6 @@ test_mra_vrFilter(
        for ( i=0; a != NULL; a = a->a_next, i++ ) {
                struct berval *bv, value;
 
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
-               if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
-                       continue;
-               }
-               value = mra->ma_value;
-
-#else /* SLAP_X_MRA_MATCH_DNATTRS */
                if ( mra->ma_desc ) {
                        if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
                                continue;
@@ -389,7 +382,6 @@ test_mra_vrFilter(
                        }
 
                }
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
 
                for ( bv = a->a_vals, j = 0; bv->bv_val != NULL; bv++, j++ ) {
                        int ret;

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index 4c2cb54d99be409dc2426b9036f6926143367eba..5276c546e6700f1ac32a1411c2e6fc67dd8b941b 100644 (file)
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -170,28 +170,12 @@ get_mra(
                return SLAPD_DISCONNECT;
        }
 
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
-       /*
-        * Let's try to implement it
-        */
-       if( ma->ma_dnattrs ) {
-               *text = "matching with \":dn\" not supported";
-               return LDAP_INAPPROPRIATE_MATCHING;
-       }
-#endif /* !SLAP_X_MRA_MATCH_DNATTRS */
-
        if( type.bv_val != NULL ) {
                rc = slap_bv2ad( &type, &ma->ma_desc, text );
                if( rc != LDAP_SUCCESS ) {
                        mra_free( ma, 1 );
                        return rc;
                }
-
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
-       } else {
-               *text = "matching without attribute description rule not supported";
-               return LDAP_INAPPROPRIATE_MATCHING;
-#endif /* !SLAP_X_MRA_MATCH_DNATTRS */
        }
 
        if( ma->ma_rule_text.bv_val != NULL ) {
@@ -203,17 +187,7 @@ get_mra(
                }
        }
 
-       /*
-        * FIXME: is it correct that ma->ma_rule_text, if present,
-        * is looked-up, checked, and then replaced by the sat_equality
-        * of the given attribute?  I'd rather do smtg like use
-        * the attribute's equality rule only if no matching rule
-        * was given, otherwise I don't see any extension ...
-        */
-
-#if 1
        if ( ma->ma_rule == NULL ) {
-#ifdef SLAP_X_MRA_MATCH_DNATTRS
                /*
                 * Need either type or rule ...
                 */
@@ -222,7 +196,6 @@ get_mra(
                        *text = "no matching rule or type";
                        return LDAP_INAPPROPRIATE_MATCHING;
                }
-#endif /* !SLAP_X_MRA_MATCH_DNATTRS */
 
                if ( ma->ma_desc->ad_type->sat_equality != NULL &&
                        ma->ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
@@ -237,25 +210,8 @@ get_mra(
                        return LDAP_INAPPROPRIATE_MATCHING;
                }
        }
-#else
-       if( ma->ma_desc != NULL &&
-               ma->ma_desc->ad_type->sat_equality != NULL &&
-               ma->ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
-       {
-               /* no matching rule was provided, use the attribute's
-                  equality rule if it supports extensible matching. */
-               ma->ma_rule = ma->ma_desc->ad_type->sat_equality;
-
-       } else {
-               mra_free( ma, 1 );
-               *text = "no appropriate matching rule";
-               return LDAP_INAPPROPRIATE_MATCHING;
-       }
-#endif
 
-#ifdef SLAP_X_MRA_MATCH_DNATTRS
        if ( ma->ma_desc != NULL ) {
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
                if( !mr_usable_with_at( ma->ma_rule, ma->ma_desc->ad_type ) ) {
                        mra_free( ma, 1 );
                        *text = "matching rule use with this attribute not appropriate";
@@ -268,7 +224,6 @@ get_mra(
                 */
                rc = value_validate_normalize( ma->ma_desc, SLAP_MR_EQUALITY,
                        &value, &ma->ma_value, text );
-#ifdef SLAP_X_MRA_MATCH_DNATTRS
        } else {
                /*
                 * Need to normalize, but how?
@@ -279,7 +234,6 @@ get_mra(
                }
 
        }
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
 
        if( rc != LDAP_SUCCESS ) {
                mra_free( ma, 1 );

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index fb5e49d36db980ac9b5f7d7e8e7675cc979951dc..db7d7ba9fa9aa5566bbe8db6f9f6658ee1a02b53 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -481,11 +481,6 @@ LDAP_SLAPD_F (int) filter_has_subordinates LDAP_P(( Filter *filter ));
  * filterentry.c
  */
 
-/*
- * define to enable dn components match in extended filter matching
- */
-#define SLAP_X_MRA_MATCH_DNATTRS
-
 LDAP_SLAPD_F (int) test_filter LDAP_P((
        Backend *be, Connection *conn, Operation *op,
        Entry *e, Filter *f ));