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 e93c80c050b1091f5754f9b012a24e277f04feb7..38d499bea6e6f6a1211ff5ea90182833bb50b9a0 100644 (file)
--- 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: