From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 26 Mar 2004 18:58:01 +0000 (+0000)
Subject: Add numericStringOrderingMatch rule (ITS#2988)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=855c22d86261008a130a91829367225ce69195fa;p=openldap

Add numericStringOrderingMatch rule (ITS#2988)
---

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 0b3de6e82a..e424f6310c 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2889,7 +2889,6 @@ char *objectIdentifierFirstComponentMatchSyntaxes[] = {
 /*
  * Other matching rules in X.520 that we do not use (yet):
  *
- * 2.5.13.9*	numericStringOrderingMatch
  * 2.5.13.25	uTCTimeMatch
  * 2.5.13.26	uTCTimeOrderingMatch
  * 2.5.13.31*	directoryStringFirstComponentMatch
@@ -2960,7 +2959,7 @@ static slap_mrule_defs_rec mrule_defs[] = {
 
 	{"( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-		SLAP_MR_SUBSTR, NULL,
+		SLAP_MR_SUBSTR, directoryStringSyntaxes,
 		NULL, UTF8StringNormalize, octetStringSubstringsMatch,
 		octetStringSubstringsIndexer, octetStringSubstringsFilter,
 		"caseIgnoreMatch" },
@@ -2993,6 +2992,13 @@ static slap_mrule_defs_rec mrule_defs[] = {
 		octetStringIndexer, octetStringFilter,
 		NULL },
 
+	{"( 2.5.13.9 NAME 'numericStringOrderingMatch' "
+		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )",
+		SLAP_MR_ORDERING, NULL,
+		NULL, numericStringNormalize, octetStringOrderingMatch,
+		NULL, NULL,
+		"numericStringMatch" },
+
 	{"( 2.5.13.10 NAME 'numericStringSubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
 		SLAP_MR_SUBSTR, NULL,