--- servers/slapd/filter.c	2003/02/27 00:54:43	1.90
+++ servers/slapd/filter.c	2003/02/28 23:14:33	1.91
@@ -1,5 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.89 2003/01/20 19:21:17 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.90 2003/02/27 00:54:43 kurt Exp $ */
 /*
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -415,9 +415,9 @@ get_substring_filter(
 		}
 
 #ifdef SLAP_NVALUES
-		/* validate using equality matching rule validator! */
+		/* validate/normalize using equality matching rule validator! */
 		rc = asserted_value_validate_normalize(
-			f->f_sub_desc, f->f_sub_desc->ad_type->sat_substr,
+			f->f_sub_desc, f->f_sub_desc->ad_type->sat_equality,
 			usage, &value, &bv, text );
 		if( rc != LDAP_SUCCESS ) {
 			goto return_error;
@@ -1434,9 +1434,9 @@ get_substring_vrFilter(
 		}
 
 #ifdef SLAP_NVALUES
-		/* validate using equality matching rule validator! */
+		/* validate/normalize using equality matching rule validator! */
 		rc = asserted_value_validate_normalize(
-			vrf->vrf_sub_desc, vrf->vrf_sub_desc->ad_type->sat_substr,
+			vrf->vrf_sub_desc, vrf->vrf_sub_desc->ad_type->sat_equality,
 			usage, &value, &bv, text );
 		if( rc != LDAP_SUCCESS ) {
 			goto return_error;