From d50064ddb840aa11a8e434b0bb7dc2e1e15a43b2 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 24 Mar 2003 02:16:10 +0000 Subject: [PATCH] SLAP_NVALUES: telephoneNumberNormalize --- servers/slapd/schema_init.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 2077511297..6e6e1a3c50 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -56,14 +56,13 @@ #define objectIdentifierFirstComponentNormalize NULL #define generalizedTimeNormalize NULL #define bitStringNormalize NULL -#define telephoneNumberNormalize NULL #define distinguishedNameNormalize dnNormalize #define distinguishedNameMatch dnMatch #define distinguishedNameIndexer octetStringIndexer #define distinguishedNameFilter octetStringFilter -#define uniqueMemberMatch dnMatch +#define uniqueMemberMatch dnMatch /* FIXME! */ #define objectIdentifierMatch octetStringMatch #define objectIdentifierIndexer octetStringIndexer @@ -2016,7 +2015,6 @@ caseExactIgnoreSubstringsFilter return LDAP_SUCCESS; } - #ifndef SLAP_NVALUES static int @@ -2033,13 +2031,23 @@ caseIgnoreMatch( LDAP_UTF8_CASEFOLD ); return LDAP_SUCCESS; } +#endif /* Remove all spaces and '-' characters */ static int +#ifdef SLAP_NVALUES +telephoneNumberNormalize( + slap_mask_t usage, + Syntax *syntax, + MatchingRule *mr, + struct berval *val, + struct berval *normalized ) +#else xtelephoneNumberNormalize( Syntax *syntax, struct berval *val, struct berval *normalized ) +#endif { char *p, *q; @@ -2064,7 +2072,6 @@ xtelephoneNumberNormalize( return LDAP_SUCCESS; } -#endif static int oidValidate( -- 2.39.5