fix ITS#2938

diff --git a/CHANGES b/CHANGES
index ecae6f5a94488b0caa3fc63423bb72174b563ed8..370c70ff05ca88e8124dbf35fdd6dbb1ea471904 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.2 Change Log
 
 OpenLDAP 2.2.6 Engineering
+       Fixed numericStringsMatch mis-definition bug (ITS#2938)
        Build Environment
                Fixed test021 portable echo bug (ITS#2933, ITS#2879)
 

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 13d6667a49ca6ec9119a748daae8e5914ad1d7d6..8ee7c5172828e59b055d59f616a6442b29c74c5b 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2987,8 +2987,8 @@ static slap_mrule_defs_rec mrule_defs[] = {
        {"( 2.5.13.8 NAME 'numericStringMatch' "
                "SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )",
                SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
-               NULL, numericStringNormalize, octetStringSubstringsMatch,
-               octetStringSubstringsIndexer, octetStringSubstringsFilter,
+               NULL, numericStringNormalize, octetStringMatch,
+               octetStringIndexer, octetStringFilter,
                NULL },
 
        {"( 2.5.13.10 NAME 'numericStringSubstringsMatch' "