From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 25 Apr 2003 17:54:16 +0000 (+0000)
Subject: Ensure that substrings are normalized properly by the routines
X-Git-Tag: OPENLDAP_REL_ENG_2_1_18~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cdeecd22d5c110668bd2f8194edf22f8e3bd028;p=thirdparty%2Fopenldap.git

Ensure that substrings are normalized properly by the routines
provided with the equality matching rule.
---

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index e93c80c050..38d499bea6 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -176,7 +176,8 @@ value_normalize(
 		mr = ad->ad_type->sat_ordering;
 		break;
 	case SLAP_MR_SUBSTR:
-		mr = ad->ad_type->sat_substr;
+		/* normalize substrings per the the equality rule */
+		mr = ad->ad_type->sat_equality;
 		break;
 	case SLAP_MR_EXT:
 	default:
@@ -244,7 +245,8 @@ value_validate_normalize(
 		mr = ad->ad_type->sat_ordering;
 		break;
 	case SLAP_MR_SUBSTR:
-		mr = ad->ad_type->sat_substr;
+		/* normalize substrings per the the equality rule */
+		mr = ad->ad_type->sat_equality;
 		break;
 	case SLAP_MR_EXT:
 	default: