SLAP_NVALUES: add numericStringNormalize()

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 4c153e041dd911a311991e9937de4c63b8e2ed67..2077511297b53d7f8d88e1fddcf365e733d3173a 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -52,7 +52,6 @@
 
 #define integerNormalize                                                       NULL
 #define integerFirstComponentNormalize                         NULL
-#define numericStringNormalize                                         NULL
 #define objectIdentifierNormalize                                      NULL
 #define objectIdentifierFirstComponentNormalize                NULL
 #define generalizedTimeNormalize                                       NULL
@@ -3709,13 +3708,20 @@ numericStringValidate(
        return LDAP_SUCCESS;
 }
 
-#ifndef SLAP_NVALUES
-
 static int
+#ifdef SLAP_NVALUES
+numericStringNormalize(
+       slap_mask_t usage,
+       Syntax *syntax,
+       MatchingRule *mr,
+       struct berval *val,
+       struct berval *normalized )
+#else
 xnumericStringNormalize(
        Syntax *syntax,
        struct berval *val,
        struct berval *normalized )
+#endif
 {
        /* removal all spaces */
        char *p, *q;
@@ -3754,6 +3760,7 @@ xnumericStringNormalize(
        return LDAP_SUCCESS;
 }
 
+#ifndef SLAP_NVALUES
 static int
 objectIdentifierFirstComponentMatch(
        int *matchp,