--- servers/slapd/filter.c	2007/10/05 06:34:03	1.144
+++ servers/slapd/filter.c	2007/10/05 07:49:47	1.145
@@ -1,5 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.143 2007/10/05 06:24:36 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.144 2007/10/05 06:34:03 ando Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 1998-2007 The OpenLDAP Foundation.
@@ -567,7 +567,7 @@ filter2bv_x( Operation *op, Filter *f, s
 {
 	int		i;
 	Filter		*p;
-	struct berval	tmp;
+	struct berval	tmp, value;
 	static struct berval
 			ber_bvfalse = BER_BVC( "(?=false)" ),
 			ber_bvtrue = BER_BVC( "(?=true)" ),
@@ -592,13 +592,6 @@ filter2bv_x( Operation *op, Filter *f, s
 	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_val = op->o_tmpalloc( LDAP_LUTIL_UUIDSTR_BUFSIZE, op->o_tmpmemctx );
-			tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,
-				f->f_av_value.bv_len, tmp.bv_val, LDAP_LUTIL_UUIDSTR_BUFSIZE );
-			assert( tmp.bv_len > 0 );
-			goto escaped;
-		}
 		goto simple;
 	case LDAP_FILTER_GE:
 		fstr->bv_len = STRLENOF("(>=)");
@@ -613,13 +606,19 @@ filter2bv_x( Operation *op, Filter *f, s
 		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++;
@@ -630,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;