Fix for dynamic adds

[openldap] / servers / slapd / filter.c

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 75398f46138ba3c70efd848f496be841ebcb6a98..8c11f81f5d3e2ed16c47594356a226b54e96e305 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -567,8 +567,7 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
 {
        int             i;
        Filter          *p;
-       struct berval   tmp;
-       char            uuid[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
+       struct berval   tmp, value;
        static struct berval
                        ber_bvfalse = BER_BVC( "(?=false)" ),
                        ber_bvtrue = BER_BVC( "(?=true)" ),
@@ -593,13 +592,6 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
        case LDAP_FILTER_EQUALITY:
                fstr->bv_len = STRLENOF("(=)");
                sign = "=";
-               if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
-                       tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,
-                               f->f_av_value.bv_len, uuid, LDAP_LUTIL_UUIDSTR_BUFSIZE );
-                       assert( tmp.bv_len > 0 );
-                       tmp.bv_val = uuid;
-                       goto escaped;
-               }
                goto simple;
        case LDAP_FILTER_GE:
                fstr->bv_len = STRLENOF("(>=)");
@@ -614,13 +606,19 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
                sign = "~=";
 
 simple:
-               filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
+               value = f->f_av_value;
+               if ( f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) {
+                       f->f_av_desc->ad_type->sat_equality->smr_normalize(
+                               (SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
+                               NULL, NULL, &f->f_av_value, &value, op->o_tmpmemctx );
+               }
+
+               filter_escape_value_x( &value, &tmp, op->o_tmpmemctx );
                /* NOTE: tmp can legitimately be NULL (meaning empty) 
                 * since in a Filter values in AVAs are supposed
                 * to have been normalized, meaning that an empty value
                 * is legal for that attribute's syntax */
 
-escaped:
                fstr->bv_len += f->f_av_desc->ad_cname.bv_len + tmp.bv_len;
                if ( undef )
                        fstr->bv_len++;
@@ -631,6 +629,10 @@ escaped:
                        f->f_av_desc->ad_cname.bv_val, sign,
                        tmp.bv_len ? tmp.bv_val : "" );
 
+               if ( value.bv_val != f->f_av_value.bv_val ) {
+                       ber_memfree_x( value.bv_val, op->o_tmpmemctx );
+               }
+
                ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
                break;