Commit d50064dd authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

SLAP_NVALUES: telephoneNumberNormalize

parent 8b19daa3
...@@ -56,14 +56,13 @@ ...@@ -56,14 +56,13 @@
#define objectIdentifierFirstComponentNormalize NULL #define objectIdentifierFirstComponentNormalize NULL
#define generalizedTimeNormalize NULL #define generalizedTimeNormalize NULL
#define bitStringNormalize NULL #define bitStringNormalize NULL
#define telephoneNumberNormalize NULL
#define distinguishedNameNormalize dnNormalize #define distinguishedNameNormalize dnNormalize
#define distinguishedNameMatch dnMatch #define distinguishedNameMatch dnMatch
#define distinguishedNameIndexer octetStringIndexer #define distinguishedNameIndexer octetStringIndexer
#define distinguishedNameFilter octetStringFilter #define distinguishedNameFilter octetStringFilter
#define uniqueMemberMatch dnMatch #define uniqueMemberMatch dnMatch /* FIXME! */
#define objectIdentifierMatch octetStringMatch #define objectIdentifierMatch octetStringMatch
#define objectIdentifierIndexer octetStringIndexer #define objectIdentifierIndexer octetStringIndexer
...@@ -2016,7 +2015,6 @@ caseExactIgnoreSubstringsFilter ...@@ -2016,7 +2015,6 @@ caseExactIgnoreSubstringsFilter
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }
#ifndef SLAP_NVALUES #ifndef SLAP_NVALUES
static int static int
...@@ -2033,13 +2031,23 @@ caseIgnoreMatch( ...@@ -2033,13 +2031,23 @@ caseIgnoreMatch(
LDAP_UTF8_CASEFOLD ); LDAP_UTF8_CASEFOLD );
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }
#endif
/* Remove all spaces and '-' characters */ /* Remove all spaces and '-' characters */
static int static int
#ifdef SLAP_NVALUES
telephoneNumberNormalize(
slap_mask_t usage,
Syntax *syntax,
MatchingRule *mr,
struct berval *val,
struct berval *normalized )
#else
xtelephoneNumberNormalize( xtelephoneNumberNormalize(
Syntax *syntax, Syntax *syntax,
struct berval *val, struct berval *val,
struct berval *normalized ) struct berval *normalized )
#endif
{ {
char *p, *q; char *p, *q;
...@@ -2064,7 +2072,6 @@ xtelephoneNumberNormalize( ...@@ -2064,7 +2072,6 @@ xtelephoneNumberNormalize(
return LDAP_SUCCESS; return LDAP_SUCCESS;
} }
#endif
static int static int
oidValidate( oidValidate(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment