X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fvalue.c;h=a1e081664d1d40f043fc7f1d652bf7c1cc186b08;hb=ed471a4d53b9bcd2cc89410743ffb4bd58b5fc05;hp=9df3ab203769931793b849edf0de259e65cbe897;hpb=2d98b19bf76b0ac01abf5df0dc2d05ae3c01e967;p=openldap

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 9df3ab2037..a1e081664d 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -324,6 +324,8 @@ value_match(
 	struct berval nv1 = { 0, NULL };
 	struct berval nv2 = { 0, NULL };
 
+	assert( mr != NULL );
+
 	if( !mr->smr_match ) {
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
@@ -389,7 +391,8 @@ int value_find_ex(
 		flags |= SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH;
 	}
 
-	if( mr->smr_syntax->ssyn_normalize ) {
+	if( !(flags & SLAP_MR_VALUE_NORMALIZED_MATCH) &&
+		mr->smr_syntax->ssyn_normalize ) {
 		struct berval nval_tmp = { 0, NULL };
 
 		rc = mr->smr_syntax->ssyn_normalize(