From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 5 Oct 2007 09:49:19 +0000 (+0000)
Subject: de-normalize simple filter values consistently
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~550
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=617bd11452014008376692ac8dbf9c201837d455;p=openldap

de-normalize simple filter values consistently
---

diff --git a/servers/slapd/back-meta/map.c b/servers/slapd/back-meta/map.c
index f0985af6e7..7904cfd4c7 100644
--- a/servers/slapd/back-meta/map.c
+++ b/servers/slapd/back-meta/map.c
@@ -213,7 +213,6 @@ map_attr_value(
 		int			remap )
 {
 	struct berval		vtmp;
-	char			uuid[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
 	int			freeval = 0;
 
 	ldap_back_map( &dc->target->mt_rwmap.rwm_at, &ad->ad_cname, mapped_attr, remap );
@@ -260,13 +259,14 @@ map_attr_value(
 			return -1;
 		}
 
-	} else if ( ad->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
-		vtmp.bv_len = lutil_uuidstr_from_normalized( value->bv_val,
-			value->bv_len, uuid, LDAP_LUTIL_UUIDSTR_BUFSIZE );
-		if ( vtmp.bv_len < 0 ) {
+	} else if ( ad->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) {
+		if ( ad->ad_type->sat_equality->smr_normalize(
+			(SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
+			NULL, NULL, value, &vtmp, NULL ) )
+		{
 			return -1;
 		}
-		vtmp.bv_val = uuid;
+		freeval = 1;
 
 	} else if ( ad == slap_schema.si_ad_objectClass || ad == slap_schema.si_ad_structuralObjectClass ) {
 		ldap_back_map( &dc->target->mt_rwmap.rwm_oc, value, &vtmp, remap );
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 5b6ec115b2..8c11f81f5d 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -567,7 +567,7 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
 {
 	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, 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_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, 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++;
@@ -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;
 
diff --git a/servers/slapd/overlays/rwmmap.c b/servers/slapd/overlays/rwmmap.c
index c5c9142090..8fa42c91ee 100644
--- a/servers/slapd/overlays/rwmmap.c
+++ b/servers/slapd/overlays/rwmmap.c
@@ -32,7 +32,6 @@
 
 #include "slap.h"
 #include "rwm.h"
-#include "lutil.h"
 
 #undef ldap_debug	/* silence a warning in ldap-int.h */
 #include "../../../libraries/libldap/ldap-int.h"
@@ -380,7 +379,6 @@ map_attr_value(
 {
 	struct berval		vtmp = BER_BVNULL;
 	int			freeval = 0;
-	char			uuid[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
 	AttributeDescription	*ad = *adp;
 	struct ldapmapping	*mapping = NULL;
 
@@ -422,13 +420,14 @@ map_attr_value(
 				return -1;
 			}
 
-		} else if ( ad->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
-			vtmp.bv_len = lutil_uuidstr_from_normalized( value->bv_val,
-				value->bv_len, uuid, LDAP_LUTIL_UUIDSTR_BUFSIZE );
-			if ( vtmp.bv_len < 0 ) {
+		} else if ( ad->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ) {
+			if ( ad->ad_type->sat_equality->smr_normalize(
+				(SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
+				NULL, NULL, value, &vtmp, NULL ) )
+			{
 				return -1;
 			}
-			vtmp.bv_val = uuid;
+			freeval = 1;
 
 		} else if ( ad == slap_schema.si_ad_objectClass
 				|| ad == slap_schema.si_ad_structuralObjectClass )
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 2136e25341..3c7026f80b 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2313,11 +2313,8 @@ syncrepl_del_nonpresent(
 
 		for (i=0; uuids[i].bv_val; i++) {
 			op->ors_slimit = 1;
-			slap_uuidstr_from_normalized( &uf.f_av_value, &uuids[i],
-				op->o_tmpmemctx );
-			filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
-			op->o_tmpfree( uf.f_av_value.bv_val, op->o_tmpmemctx );
 			uf.f_av_value = uuids[i];
+			filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
 			rc = be->be_search( op, &rs_search );
 			op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
 		}