/* schema_init.c - init builtin schema */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
-/****
-LDAP/X.500 string syntax / matching rules have a few oddities. This
-comment attempts to detail how slapd(8) treats them.
-
-Summary:
- StringSyntax X.500 LDAP Matching
- DirectoryString CHOICE UTF8 i/e + ignore insignificant spaces
- PrintableString subset subset i/e + ignore insignificant spaces
- NumericString subset subset ignore all spaces
- IA5String ASCII ASCII i/e + ignore insignificant spaces
- TeletexString T.61 T.61 i/e + ignore insignificant spaces
-
- TelephoneNumber subset subset i + ignore all spaces and "-"
-
- See draft-ietf-ldapbis-strpro for details (once published).
-
-
-Directory String -
- In X.500(93), a directory string can be either a PrintableString,
- a bmpString, or a UniversalString (e.g., UCS (a subset of Unicode)).
- In later versions, more CHOICEs were added. In all cases the string
- must be non-empty.
-
- In LDPAv3, a directory string is a UTF-8 encoded UCS string.
-
- For matching, there are both case ignore and exact rules. Both
- also require that "insignificant" spaces be ignored.
- spaces before the first non-space are ignored;
- spaces after the last non-space are ignored;
- spaces after a space are ignored.
- Note: by these rules (and as clarified in X.520), a string of only
- spaces is to be treated as if held one space, not empty (which would
- be a syntax error).
-
-NumericString
- In ASN.1, numeric string is just a string of digits and spaces and
- could be empty. However, in X.500, all attribute values of numeric
- string carry a non-empty constraint. For example:
-
- internationalISDNNumber ATTRIBUTE ::= {
- WITH SYNTAX InternationalISDNNumber
- EQUALITY MATCHING RULE numericStringMatch
- SUBSTRINGS MATCHING RULE numericStringSubstringsMatch
- ID id-at-internationalISDNNumber }
- InternationalISDNNumber ::= NumericString (SIZE(1..ub-international-isdn-number))
-
- Unfornately, some assertion values are don't carry the same constraint
- (but its unclear how such an assertion could ever be true). In LDAP,
- there is one syntax (numericString) not two (numericString with constraint,
- numericString without constraint). This should be treated as numericString
- with non-empty constraint. Note that while someone may have no
- ISDN number, there are no ISDN numbers which are zero length.
-
- In matching, spaces are ignored.
-
-PrintableString
- In ASN.1, Printable string is just a string of printable characters and
- can be empty. In X.500, semantics much like NumericString (see serialNumber
- for a like example) excepting uses insignificant space handling instead of
- ignore all spaces.
-
-IA5String
- Basically same as PrintableString. There are no examples in X.500, but
- same logic applies. So we require them to be non-empty as well.
-
-****/
-
-
#include "portable.h"
#include <stdio.h>
#define HASH_Update(c,buf,len) lutil_HASHUpdate(c,buf,len)
#define HASH_Final(d,c) lutil_HASHFinal(d,c)
-/* recycled validatation routines */
-#define berValidate blobValidate
+#define SLAP_NVALUES 1
-/* unimplemented pretters */
-#define integerPretty NULL
+#ifdef SLAP_NVALUES
+/* TO BE DELETED */
+#define SLAP_MR_DN_FOLD (0)
+
+#define SLAP_MR_ASSOCIATED(mr, with) \
+ ((mr) == (with) || (mr)->smr_associated == (with))
+
+#define xUTF8StringNormalize NULL
+#define xIA5StringNormalize NULL
+#define xtelephoneNumberNormalize NULL
+#define xgeneralizedTimeNormalize NULL
+#define xintegerNormalize NULL
+#define xnumericStringNormalize NULL
+#define xnameUIDNormalize NULL
+#define xdnNormalize NULL
+
+/* (new) normalization routines */
+#define caseExactIA5Normalize IA5StringNormalize
+#define caseIgnoreIA5Normalize IA5StringNormalize
+#define caseExactNormalize UTF8StringNormalize
+#define caseIgnoreNormalize UTF8StringNormalize
+
+#define integerFirstComponentNormalize NULL
+#define objectIdentifierNormalize NULL
+#define objectIdentifierFirstComponentNormalize NULL
+
+#define distinguishedNameNormalize dnNormalize
+#define distinguishedNameMatch dnMatch
+#define distinguishedNameIndexer octetStringIndexer
+#define distinguishedNameFilter octetStringFilter
+
+#define integerOrderingMatch integerMatch
+#define integerFirstComponentMatch NULL
+#define integerIndexer octetStringIndexer
+#define integerFilter octetStringFilter
-/* recycled matching routines */
-#define bitStringMatch octetStringMatch
-#define numericStringMatch caseIgnoreIA5Match
-#define objectIdentifierMatch caseIgnoreIA5Match
-#define telephoneNumberMatch caseIgnoreIA5Match
-#define telephoneNumberSubstringsMatch caseIgnoreIA5SubstringsMatch
#define generalizedTimeMatch caseIgnoreIA5Match
#define generalizedTimeOrderingMatch caseIgnoreIA5Match
-#define uniqueMemberMatch dnMatch
-#define integerFirstComponentMatch integerMatch
+
+#define uniqueMemberMatch dnMatch /* FIXME! */
+
+#define objectIdentifierMatch octetStringMatch
+#define objectIdentifierIndexer octetStringIndexer
+#define objectIdentifierFilter octetStringFilter
+
+#define OpenLDAPaciMatch NULL
+
+#define bitStringMatch octetStringMatch
+#define bitStringIndexer octetStringIndexer
+#define bitStringFilter octetStringFilter
+
+#define caseIgnoreMatch octetStringMatch
+#define caseIgnoreOrderingMatch octetStringOrderingMatch
+#define caseIgnoreIndexer octetStringIndexer
+#define caseIgnoreFilter octetStringFilter
+
+#define caseIgnoreSubstringsMatch octetStringSubstringsMatch
+#define caseIgnoreSubstringsIndexer octetStringSubstringsIndexer
+#define caseIgnoreSubstringsFilter octetStringSubstringsFilter
+
+#define caseExactMatch octetStringMatch
+#define caseExactOrderingMatch octetStringOrderingMatch
+#define caseExactIndexer octetStringIndexer
+#define caseExactFilter octetStringFilter
+
+#define caseExactSubstringsMatch octetStringSubstringsMatch
+#define caseExactSubstringsIndexer octetStringSubstringsIndexer
+#define caseExactSubstringsFilter octetStringSubstringsFilter
+
+#define caseExactIA5Match octetStringMatch
+#define caseExactIA5Indexer octetStringIndexer
+#define caseExactIA5Filter octetStringFilter
+
+#define caseExactIA5SubstringsMatch octetStringSubstringsMatch
+#define caseExactIA5SubstringsIndexer octetStringSubstringsIndexer
+#define caseExactIA5SubstringsFilter octetStringSubstringsFilter
+
+#define caseIgnoreIA5Match octetStringMatch
+#define caseIgnoreIA5Indexer octetStringIndexer
+#define caseIgnoreIA5Filter octetStringFilter
+
+#define caseIgnoreIA5SubstringsMatch caseExactIA5SubstringsMatch
+#define caseIgnoreIA5SubstringsIndexer caseExactIA5SubstringsIndexer
+#define caseIgnoreIA5SubstringsFilter caseExactIA5SubstringsFilter
+
+#define numericStringMatch octetStringMatch
+#define numericStringIndexer octetStringIndexer
+#define numericStringFilter octetStringFilter
+
+#define numericStringSubstringsMatch caseExactIA5SubstringsMatch
+#define numericStringSubstringsIndexer caseExactIA5SubstringsIndexer
+#define numericStringSubstringsFilter caseExactIA5SubstringsFilter
+
+#define telephoneNumberMatch octetStringMatch
+#define telephoneNumberIndexer octetStringIndexer
+#define telephoneNumberFilter octetStringFilter
+
+#define telephoneNumberSubstringsMatch caseExactIA5SubstringsMatch
+#define telephoneNumberSubstringsIndexer caseExactIA5SubstringsIndexer
+#define telephoneNumberSubstringsFilter caseExactIA5SubstringsFilter
+
+#define booleanIndexer octetStringIndexer
+#define booleanFilter octetStringFilter
+#endif
+
+/* validatation routines */
+#define berValidate blobValidate
/* approx matching rules */
+#ifdef SLAP_NVALUES
+#define directoryStringApproxMatchOID NULL
+#define IA5StringApproxMatchOID NULL
+#else
#define directoryStringApproxMatchOID "1.3.6.1.4.1.4203.666.4.4"
#define directoryStringApproxMatch approxMatch
#define directoryStringApproxIndexer approxIndexer
#define IA5StringApproxMatch approxMatch
#define IA5StringApproxIndexer approxIndexer
#define IA5StringApproxFilter approxFilter
+#endif
-/* ordering matching rules */
-#define caseIgnoreOrderingMatch caseIgnoreMatch
-#define caseExactOrderingMatch caseExactMatch
-#define integerOrderingMatch integerMatch
+#ifndef SLAP_NVALUES
-/* unimplemented matching routines */
-#define caseIgnoreListMatch NULL
-#define caseIgnoreListSubstringsMatch NULL
-#define protocolInformationMatch NULL
+#define xdnNormalize dnNormalize
-#ifdef SLAPD_ACI_ENABLED
+/* (new) normalization routines */
+#define caseExactNormalize NULL
+#define caseExactIA5Normalize NULL
+#define caseIgnoreNormalize NULL
+#define caseIgnoreIA5Normalize NULL
+#define distinguishedNameNormalize NULL
+#define integerNormalize NULL
+#define integerFirstComponentNormalize NULL
+#define numericStringNormalize NULL
+#define objectIdentifierNormalize NULL
+#define objectIdentifierFirstComponentNormalize NULL
+#define generalizedTimeNormalize NULL
+#define uniqueMemberNormalize NULL
+#define telephoneNumberNormalize NULL
+
+
+/* matching routines */
+#define bitStringMatch octetStringMatch
+#define bitStringIndexer octetStringIndexer
+#define bitStringFilter octetStringFilter
+
+#define numericStringMatch caseIgnoreIA5Match
+#define numericStringIndexer NULL
+#define numericStringFilter NULL
+#define numericStringSubstringsIndexer NULL
+#define numericStringSubstringsFilter NULL
+
+#define objectIdentifierMatch octetStringMatch
+#define objectIdentifierIndexer caseIgnoreIA5Indexer
+#define objectIdentifierFilter caseIgnoreIA5Filter
+
+#define octetStringSubstringsMatch NULL
#define OpenLDAPaciMatch NULL
-#endif
-#ifdef SLAPD_AUTHPASSWD
-#define authPasswordMatch NULL
-#endif
-/* recycled indexing/filtering routines */
-#define dnIndexer caseExactIgnoreIndexer
-#define dnFilter caseExactIgnoreFilter
-#define bitStringFilter octetStringFilter
-#define bitStringIndexer octetStringIndexer
+#define generalizedTimeMatch caseIgnoreIA5Match
+#define generalizedTimeOrderingMatch caseIgnoreIA5Match
+
+#define uniqueMemberMatch dnMatch
+#define numericStringSubstringsMatch NULL
+
+#define caseExactIndexer caseExactIgnoreIndexer
+#define caseExactFilter caseExactIgnoreFilter
+#define caseExactOrderingMatch caseExactMatch
+#define caseExactSubstringsMatch caseExactIgnoreSubstringsMatch
+#define caseExactSubstringsIndexer caseExactIgnoreSubstringsIndexer
+#define caseExactSubstringsFilter caseExactIgnoreSubstringsFilter
+#define caseIgnoreIndexer caseExactIgnoreIndexer
+#define caseIgnoreFilter caseExactIgnoreFilter
+#define caseIgnoreOrderingMatch caseIgnoreMatch
+#define caseIgnoreSubstringsMatch caseExactIgnoreSubstringsMatch
+#define caseIgnoreSubstringsIndexer caseExactIgnoreSubstringsIndexer
+#define caseIgnoreSubstringsFilter caseExactIgnoreSubstringsFilter
+
+#define integerOrderingMatch integerMatch
+#define integerFirstComponentMatch integerMatch
-#define telephoneNumberIndexer caseIgnoreIA5Indexer
-#define telephoneNumberFilter caseIgnoreIA5Filter
+#define distinguishedNameMatch dnMatch
+#define distinguishedNameIndexer caseExactIgnoreIndexer
+#define distinguishedNameFilter caseExactIgnoreFilter
+
+#define telephoneNumberMatch caseIgnoreIA5Match
+#define telephoneNumberSubstringsMatch caseIgnoreIA5SubstringsMatch
+#define telephoneNumberIndexer caseIgnoreIA5Indexer
+#define telephoneNumberFilter caseIgnoreIA5Filter
#define telephoneNumberSubstringsIndexer caseIgnoreIA5SubstringsIndexer
#define telephoneNumberSubstringsFilter caseIgnoreIA5SubstringsFilter
-static MatchingRule *caseExactMatchingRule;
-static MatchingRule *caseExactSubstringsMatchingRule;
-static MatchingRule *integerFirstComponentMatchingRule;
-
-static const struct MatchingRulePtr {
- const char *oid;
- MatchingRule **mr;
-} mr_ptr [] = {
- /* must match OIDs below */
- { "2.5.13.5", &caseExactMatchingRule },
- { "2.5.13.7", &caseExactSubstringsMatchingRule },
- { "2.5.13.29", &integerFirstComponentMatchingRule }
-};
+#define booleanIndexer octetStringIndexer
+#define booleanFilter octetStringFilter
+#endif
static char *bvcasechr( struct berval *bv, unsigned char c, ber_len_t *len )
return LDAP_SUCCESS;
}
+static int
+octetStringOrderingMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ ber_len_t v_len = value->bv_len;
+ ber_len_t av_len = ((struct berval *) assertedValue)->bv_len;
+
+ int match = memcmp( value->bv_val,
+ ((struct berval *) assertedValue)->bv_val,
+ (v_len < av_len ? v_len : av_len) );
+
+ if( match == 0 ) match = v_len - av_len;
+
+ *matchp = match;
+ return LDAP_SUCCESS;
+}
+
/* Index generation function */
-static int octetStringIndexer(
+int octetStringIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
}
keys[i].bv_val = NULL;
+ keys[i].bv_len = 0;
*keysp = keys;
}
/* Index generation function */
-static int octetStringFilter(
+int octetStringFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
size_t slen, mlen;
BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
- struct berval *value = (struct berval *) assertValue;
+ struct berval *value = (struct berval *) assertedValue;
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
ber_dupbv( keys, &digest );
keys[1].bv_val = NULL;
+ keys[1].bv_len = 0;
*keysp = keys;
return LDAP_SUCCESS;
}
-static int
-bitStringNormalize(
- Syntax *syntax,
- struct berval *val,
- struct berval *normalized )
-{
- /*
- * A normalized bitString is has no extaneous (leading) zero bits.
- * That is, '00010'B is normalized to '10'B
- * However, as a special case, '0'B requires no normalization.
- */
- char *p;
-
- /* start at the first bit */
- p = &val->bv_val[1];
-
- /* Find the first non-zero bit */
- while ( *p == '0' ) p++;
-
- if( *p == '\'' ) {
- /* no non-zero bits */
- ber_str2bv( "\'0\'B", sizeof("\'0\'B") - 1, 1, normalized );
- goto done;
- }
-
- normalized->bv_val = ch_malloc( val->bv_len + 1 );
-
- normalized->bv_val[0] = '\'';
- normalized->bv_len = 1;
-
- for( ; *p != '\0'; p++ ) {
- normalized->bv_val[normalized->bv_len++] = *p;
- }
-
- normalized->bv_val[normalized->bv_len] = '\0';
-
-done:
- return LDAP_SUCCESS;
-}
-
static int
nameUIDValidate(
Syntax *syntax,
return rc;
}
+#ifdef SLAP_NVALUES
+static int
+uniqueMemberNormalize(
+ slap_mask_t usage,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *val,
+ struct berval *normalized )
+#else
static int
-nameUIDNormalize(
+xnameUIDNormalize(
Syntax *syntax,
struct berval *val,
struct berval *normalized )
+#endif
{
struct berval out;
int rc;
ber_dupbv( &out, val );
if( out.bv_len != 0 ) {
- struct berval uidin = { 0, NULL };
- struct berval uidout = { 0, NULL };
+ struct berval uid = { 0, NULL };
if( out.bv_val[out.bv_len-1] == 'B'
&& out.bv_val[out.bv_len-2] == '\'' )
{
/* assume presence of optional UID */
- uidin.bv_val = strrchr( out.bv_val, '#' );
+ uid.bv_val = strrchr( out.bv_val, '#' );
- if( uidin.bv_val == NULL ) {
+ if( uid.bv_val == NULL ) {
free( out.bv_val );
return LDAP_INVALID_SYNTAX;
}
- uidin.bv_len = out.bv_len - (uidin.bv_val - out.bv_val);
- out.bv_len -= uidin.bv_len--;
+ uid.bv_len = out.bv_len - (uid.bv_val - out.bv_val);
+ out.bv_len -= uid.bv_len--;
/* temporarily trim the UID */
- *(uidin.bv_val++) = '\0';
-
- rc = bitStringNormalize( syntax, &uidin, &uidout );
-
- if( rc != LDAP_SUCCESS ) {
- free( out.bv_val );
- return LDAP_INVALID_SYNTAX;
- }
+ *(uid.bv_val++) = '\0';
}
-#ifdef USE_DN_NORMALIZE
rc = dnNormalize2( NULL, &out, normalized );
-#else
- rc = dnPretty2( NULL, &out, normalized );
-#endif
if( rc != LDAP_SUCCESS ) {
free( out.bv_val );
- free( uidout.bv_val );
return LDAP_INVALID_SYNTAX;
}
- if( uidout.bv_len ) {
+ if( uid.bv_len ) {
normalized->bv_val = ch_realloc( normalized->bv_val,
- normalized->bv_len + uidout.bv_len + sizeof("#") );
+ normalized->bv_len + uid.bv_len + sizeof("#") );
/* insert the separator */
normalized->bv_val[normalized->bv_len++] = '#';
/* append the UID */
AC_MEMCPY( &normalized->bv_val[normalized->bv_len],
- uidout.bv_val, uidout.bv_len );
- normalized->bv_len += uidout.bv_len;
+ uid.bv_val, uid.bv_len );
+ normalized->bv_len += uid.bv_len;
/* terminate */
normalized->bv_val[normalized->bv_len] = '\0';
return LDAP_SUCCESS;
}
+/*-------------------------------------------------------------------
+LDAP/X.500 string syntax / matching rules have a few oddities. This
+comment attempts to detail how slapd(8) treats them.
+
+Summary:
+ StringSyntax X.500 LDAP Matching/Comments
+ DirectoryString CHOICE UTF8 i/e + ignore insignificant spaces
+ PrintableString subset subset i/e + ignore insignificant spaces
+ PrintableString subset subset i/e + ignore insignificant spaces
+ NumericString subset subset ignore all spaces
+ IA5String ASCII ASCII i/e + ignore insignificant spaces
+ TeletexString T.61 T.61 i/e + ignore insignificant spaces
+
+ TelephoneNumber subset subset i + ignore all spaces and "-"
+
+ See draft-ietf-ldapbis-strpro for details (once published).
+
+
+Directory String -
+ In X.500(93), a directory string can be either a PrintableString,
+ a bmpString, or a UniversalString (e.g., UCS (a subset of Unicode)).
+ In later versions, more CHOICEs were added. In all cases the string
+ must be non-empty.
+
+ In LDAPv3, a directory string is a UTF-8 encoded UCS string.
+ A directory string cannot be zero length.
+
+ For matching, there are both case ignore and exact rules. Both
+ also require that "insignificant" spaces be ignored.
+ spaces before the first non-space are ignored;
+ spaces after the last non-space are ignored;
+ spaces after a space are ignored.
+ Note: by these rules (and as clarified in X.520), a string of only
+ spaces is to be treated as if held one space, not empty (which
+ would be a syntax error).
+
+NumericString
+ In ASN.1, numeric string is just a string of digits and spaces
+ and could be empty. However, in X.500, all attribute values of
+ numeric string carry a non-empty constraint. For example:
+
+ internationalISDNNumber ATTRIBUTE ::= {
+ WITH SYNTAX InternationalISDNNumber
+ EQUALITY MATCHING RULE numericStringMatch
+ SUBSTRINGS MATCHING RULE numericStringSubstringsMatch
+ ID id-at-internationalISDNNumber }
+ InternationalISDNNumber ::=
+ NumericString (SIZE(1..ub-international-isdn-number))
+
+ Unforunately, some assertion values are don't carry the same
+ constraint (but its unclear how such an assertion could ever
+ be true). In LDAP, there is one syntax (numericString) not two
+ (numericString with constraint, numericString without constraint).
+ This should be treated as numericString with non-empty constraint.
+ Note that while someone may have no ISDN number, there are no ISDN
+ numbers which are zero length.
+
+ In matching, spaces are ignored.
+
+PrintableString
+ In ASN.1, Printable string is just a string of printable characters
+ and can be empty. In X.500, semantics much like NumericString (see
+ serialNumber for a like example) excepting uses insignificant space
+ handling instead of ignore all spaces.
+
+IA5String
+ Basically same as PrintableString. There are no examples in X.500,
+ but same logic applies. So we require them to be non-empty as
+ well.
+
+-------------------------------------------------------------------*/
+
static int
UTF8StringValidate(
Syntax *syntax,
int len;
unsigned char *u = in->bv_val;
- if( !in->bv_len ) return LDAP_INVALID_SYNTAX;
+ if( in->bv_len == 0 && syntax == slap_schema.si_syn_directoryString ) {
+ /* directory strings cannot be empty */
+ return LDAP_INVALID_SYNTAX;
+ }
for( count = in->bv_len; count > 0; count-=len, u+=len ) {
/* get the length indicated by the first byte */
if( LDAP_UTF8_OFFSET( u ) != len ) return LDAP_INVALID_SYNTAX;
}
- if( count != 0 ) return LDAP_INVALID_SYNTAX;
+ if( count != 0 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
return LDAP_SUCCESS;
}
+#ifdef SLAP_NVALUES
static int
UTF8StringNormalize(
+ slap_mask_t use,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *val,
+ struct berval *normalized )
+{
+ struct berval tmp, nvalue;
+ int flags;
+ int i, wasspace;
+
+ if( val->bv_val == NULL ) {
+ /* assume we're dealing with a syntax (e.g., UTF8String)
+ * which allows empty strings
+ */
+ normalized->bv_len = 0;
+ normalized->bv_val = NULL;
+ return LDAP_SUCCESS;
+ }
+
+ flags = SLAP_MR_ASSOCIATED(mr, slap_schema.si_mr_caseExactMatch )
+ ? LDAP_UTF8_NOCASEFOLD : LDAP_UTF8_CASEFOLD;
+ flags |= ( ( use & SLAP_MR_EQUALITY_APPROX ) == SLAP_MR_EQUALITY_APPROX )
+ ? LDAP_UTF8_APPROX : 0;
+
+ val = UTF8bvnormalize( val, &tmp, flags );
+ if( val == NULL ) {
+ return LDAP_OTHER;
+ }
+
+ /* collapse spaces (in place) */
+ nvalue.bv_len = 0;
+ nvalue.bv_val = tmp.bv_val;
+
+ wasspace=1; /* trim leading spaces */
+ for( i=0; i<tmp.bv_len; i++) {
+ if ( ASCII_SPACE( tmp.bv_val[i] )) {
+ if( wasspace++ == 0 ) {
+ /* trim repeated spaces */
+ nvalue.bv_val[nvalue.bv_len++] = tmp.bv_val[i];
+ }
+ } else {
+ wasspace = 0;
+ nvalue.bv_val[nvalue.bv_len++] = tmp.bv_val[i];
+ }
+ }
+
+ if( nvalue.bv_len ) {
+ if( wasspace ) {
+ /* last character was a space, trim it */
+ --nvalue.bv_len;
+ }
+ nvalue.bv_val[nvalue.bv_len] = '\0';
+
+ } else {
+ /* string of all spaces is treated as one space */
+ nvalue.bv_val[0] = ' ';
+ nvalue.bv_val[1] = '\0';
+ nvalue.bv_len = 1;
+ }
+
+ *normalized = nvalue;
+ return LDAP_SUCCESS;
+}
+#else
+
+static int
+xUTF8StringNormalize(
Syntax *syntax,
struct berval *val,
struct berval *normalized )
assert( q+len <= p );
/* cannot start with a space */
- assert( !ASCII_SPACE(normalized->bv_val[0]) );
+ assert( !ASCII_SPACE( normalized->bv_val[0] ) );
/*
* If the string ended in space, backup the pointer one
/* Returns Unicode canonically normalized copy of a substring assertion
* Skipping attribute description */
static SubstringsAssertion *
-UTF8SubstringsassertionNormalize(
+UTF8SubstringsAssertionNormalize(
SubstringsAssertion *sa,
unsigned casefold )
{
SubstringsAssertion *nsa;
int i;
- nsa = (SubstringsAssertion *)ch_calloc( 1, sizeof(SubstringsAssertion) );
+ nsa = (SubstringsAssertion *)SLAP_CALLOC( 1, sizeof(SubstringsAssertion) );
if( nsa == NULL ) {
return NULL;
}
for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
/* empty */
}
- nsa->sa_any = (struct berval *)ch_malloc( (i + 1) * sizeof(struct berval) );
+ nsa->sa_any = (struct berval *)
+ SLAP_MALLOC( (i + 1) * sizeof(struct berval) );
+ if( nsa->sa_any == NULL ) {
+ goto err;
+ }
+
for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
UTF8bvnormalize( &sa->sa_any[i], &nsa->sa_any[i],
- casefold );
+ casefold );
if( nsa->sa_any[i].bv_val == NULL ) {
goto err;
}
err:
if ( nsa->sa_final.bv_val ) free( nsa->sa_final.bv_val );
- if ( nsa->sa_any )ber_bvarray_free( nsa->sa_any );
+ if ( nsa->sa_any ) ber_bvarray_free( nsa->sa_any );
if ( nsa->sa_initial.bv_val ) free( nsa->sa_initial.bv_val );
ch_free( nsa );
return NULL;
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
char *c;
BerVarray keys;
/* Yes, this is necessary */
- val = UTF8bvnormalize( ((struct berval *)assertValue),
+ val = UTF8bvnormalize( ((struct berval *)assertedValue),
NULL, LDAP_UTF8_APPROX );
if( val == NULL || val->bv_val == NULL ) {
keys = (struct berval *)ch_malloc( sizeof(struct berval) );
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
BerVarray keys;
keys = (struct berval *)ch_malloc( sizeof( struct berval * ) * 2 );
/* Yes, this is necessary */
- s = UTF8normalize( ((struct berval *)assertValue),
+ s = UTF8normalize( ((struct berval *)assertedValue),
UTF8_NOCASEFOLD );
if( s == NULL ) {
keys[0] = NULL;
char *nav = NULL;
unsigned casefold;
- casefold = ( mr != caseExactSubstringsMatchingRule )
+ casefold = ( mr != slap_schema.si_mr_caseExactSubstringsMatch )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
if ( UTF8bvnormalize( value, &left, casefold ) == NULL ) {
}
nav = left.bv_val;
- sub = UTF8SubstringsassertionNormalize( assertedValue, casefold );
+ sub = UTF8SubstringsAssertionNormalize( assertedValue, casefold );
if( sub == NULL ) {
match = -1;
goto done;
BerVarray values,
BerVarray *keysp )
{
- int i;
- unsigned casefold;
+ int i,j;
+ unsigned casefold,wasspace;
size_t slen, mlen;
BerVarray keys;
HASH_CONTEXT HASHcontext;
slen = syntax->ssyn_oidlen;
mlen = mr->smr_oidlen;
- casefold = ( mr != caseExactMatchingRule )
+ casefold = ( mr != slap_schema.si_mr_caseExactMatch )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
for( i=0; values[i].bv_val != NULL; i++ ) {
- struct berval value;
+ struct berval value, nvalue;
UTF8bvnormalize( &values[i], &value, casefold );
+ /* collapse spaces (in place) */
+ nvalue.bv_len = 0;
+ nvalue.bv_val = value.bv_val;
+
+ wasspace=1;
+ for( j=0; j<value.bv_len; j++) {
+ if ( ASCII_SPACE( value.bv_val[j] )) {
+ if( wasspace++ == 0 ) {
+ nvalue.bv_val[nvalue.bv_len++] = value.bv_val[j];
+ }
+ } else {
+ wasspace = 0;
+ nvalue.bv_val[nvalue.bv_len++] = value.bv_val[j];
+ }
+ }
+
+ if( nvalue.bv_len == 0 ) {
+ nvalue.bv_val = " ";
+ nvalue.bv_len = sizeof(" ")-1;
+ } else {
+ if( wasspace ) --nvalue.bv_len;
+ nvalue.bv_val[nvalue.bv_len] = '\0';
+ }
+
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
HASH_Update( &HASHcontext,
HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
HASH_Update( &HASHcontext,
- value.bv_val, value.bv_len );
+ nvalue.bv_val, nvalue.bv_len );
HASH_Final( HASHdigest, &HASHcontext );
free( value.bv_val );
-
ber_dupbv( &keys[i], &digest );
}
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
unsigned casefold;
slen = syntax->ssyn_oidlen;
mlen = mr->smr_oidlen;
- casefold = ( mr != caseExactMatchingRule )
+ casefold = ( mr != slap_schema.si_mr_caseExactMatch )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
- UTF8bvnormalize( (struct berval *) assertValue, &value, casefold );
+ UTF8bvnormalize( (struct berval *) assertedValue, &value, casefold );
/* This usually happens if filter contains bad UTF8 */
if( value.bv_val == NULL ) {
keys = ch_malloc( sizeof( struct berval ) );
*keysp = keys;
return LDAP_SUCCESS;
}
+#endif
/* Substrings Index generation function */
-static int caseExactIgnoreSubstringsIndexer(
- slap_mask_t use,
+static int
+#ifdef SLAP_NVALUES
+octetStringSubstringsIndexer
+#else
+caseExactIgnoreSubstringsIndexer
+#endif
+ ( slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
BerVarray values,
BerVarray *keysp )
{
- unsigned casefold;
- ber_len_t i, nkeys;
+ ber_len_t i, j, nkeys;
size_t slen, mlen;
BerVarray keys;
- BerVarray nvalues;
+#ifndef SLAP_NVALUES
+ BerVarray tvalues, nvalues;
+ unsigned casefold, wasspace;
+#endif
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
- nkeys=0;
-
+#ifndef SLAP_NVALUES
for( i=0; values[i].bv_val != NULL; i++ ) {
/* empty - just count them */
}
/* we should have at least one value at this point */
assert( i > 0 );
- casefold = ( mr != caseExactSubstringsMatchingRule )
+ casefold = ( mr != slap_schema.si_mr_caseExactSubstringsMatch )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
+ tvalues = ch_malloc( sizeof( struct berval ) * (i+1) );
nvalues = ch_malloc( sizeof( struct berval ) * (i+1) );
+
for( i=0; values[i].bv_val != NULL; i++ ) {
- UTF8bvnormalize( &values[i], &nvalues[i], casefold );
+ UTF8bvnormalize( &values[i], &tvalues[i], casefold );
+
+ /* collapse spaces (in place) */
+ nvalues[i].bv_len = 0;
+ nvalues[i].bv_val = tvalues[i].bv_val;
+
+ wasspace=1;
+ for( j=0; j<tvalues[i].bv_len; j++) {
+ if ( ASCII_SPACE( tvalues[i].bv_val[j] )) {
+ if( wasspace++ == 0 ) {
+ nvalues[i].bv_val[nvalues[i].bv_len++] =
+ tvalues[i].bv_val[j];
+ }
+ } else {
+ wasspace = 0;
+ nvalues[i].bv_val[nvalues[i].bv_len++] = tvalues[i].bv_val[j];
+ }
+ }
+
+ if( nvalues[i].bv_len == 0 ) {
+ nvalues[i].bv_val = " ";
+ nvalues[i].bv_len = sizeof(" ")-1;
+ } else {
+ if( wasspace ) --nvalues[i].bv_len;
+ nvalues[i].bv_val[nvalues[i].bv_len] = '\0';
+ }
}
+
+ tvalues[i].bv_val = NULL;
nvalues[i].bv_val = NULL;
values = nvalues;
+#endif
+
+ nkeys=0;
for( i=0; values[i].bv_val != NULL; i++ ) {
/* count number of indices to generate */
if( nkeys == 0 ) {
/* no keys to generate */
*keysp = NULL;
- ber_bvarray_free( nvalues );
+#ifndef SLAP_NVALUES
+ ber_bvarray_free( tvalues );
+ ch_free( nvalues );
+#endif
return LDAP_SUCCESS;
}
*keysp = NULL;
}
- ber_bvarray_free( nvalues );
+#ifndef SLAP_NVALUES
+ ber_bvarray_free( tvalues );
+ ch_free( nvalues );
+#endif
return LDAP_SUCCESS;
}
-static int caseExactIgnoreSubstringsFilter(
- slap_mask_t use,
+static int
+#ifdef SLAP_NVALUES
+octetStringSubstringsFilter
+#else
+caseExactIgnoreSubstringsFilter
+#endif
+ ( slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
SubstringsAssertion *sa;
struct berval *value;
struct berval digest;
- casefold = ( mr != caseExactSubstringsMatchingRule )
+#ifndef SLAP_NVALUES
+ casefold = ( mr != slap_schema.si_mr_caseExactSubstringsMatch )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
- sa = UTF8SubstringsassertionNormalize( assertValue, casefold );
+ sa = UTF8SubstringsAssertionNormalize( assertedValue, casefold );
if( sa == NULL ) {
*keysp = NULL;
return LDAP_SUCCESS;
}
+#else
+ sa = (SubstringsAssertion *) assertedValue;
+#endif
if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
}
if( nkeys == 0 ) {
+#ifndef SLAP_NVALUES
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
ch_free( sa );
+#endif
*keysp = NULL;
return LDAP_SUCCESS;
}
ch_free( keys );
*keysp = NULL;
}
+
+#ifndef SLAP_NVALUES
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
ch_free( sa );
+#endif
return LDAP_SUCCESS;
}
+#ifndef SLAP_NVALUES
static int
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;
/* Skip leading space/sign/zeroes, and get the sign of the *value number */
v = value->bv_val;
vlen = value->bv_len;
- if( mr == integerFirstComponentMatchingRule ) {
+
+#ifndef SLAP_NVALUES
+ if( mr == slap_schema.si_mr_integerFirstComponentMatch ) {
char *tmp = memchr( v, '$', vlen );
- if( tmp )
- vlen = tmp - v;
- while( vlen && ASCII_SPACE( v[vlen-1] ))
- vlen--;
+ if( tmp ) vlen = tmp - v;
+ while( vlen && ASCII_SPACE( v[vlen-1] )) vlen--;
+ }
+#endif
+
+ for( ; vlen && ( *v < '1' || '9' < *v ); v++, vlen-- ) { /* ANSI 2.2.1 */
+ if( *v == '-' ) vsign = -1;
}
- for( ; vlen && ( *v < '1' || '9' < *v ); v++, vlen-- ) /* ANSI 2.2.1 */
- if( *v == '-' )
- vsign = -1;
- if( vlen == 0 )
- vsign = 0;
+
+ if( vlen == 0 ) vsign = 0;
/* Do the same with the *assertedValue number */
asserted = (struct berval *) assertedValue;
if(( val->bv_val[0] == '+' ) || ( val->bv_val[0] == '-' )) {
if( val->bv_len < 2 ) return LDAP_INVALID_SYNTAX;
+
} else if( !ASCII_DIGIT(val->bv_val[0]) ) {
return LDAP_INVALID_SYNTAX;
}
}
static int
+#ifdef SLAP_NVALUES
integerNormalize(
+ slap_mask_t use,
Syntax *syntax,
+ MatchingRule *mr,
struct berval *val,
struct berval *normalized )
+#else
+xintegerNormalize(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *normalized )
+#endif
{
char *p;
int negative=0;
if( len == 0 ) {
normalized->bv_val = ch_strdup("0");
normalized->bv_len = 1;
- }
- else {
+
+ } else {
normalized->bv_len = len+negative;
normalized->bv_val = ch_malloc( normalized->bv_len + 1 );
- if( negative ) {
- normalized->bv_val[0] = '-';
- }
+ if( negative ) normalized->bv_val[0] = '-';
AC_MEMCPY( normalized->bv_val + negative, p, len );
normalized->bv_val[len+negative] = '\0';
}
return LDAP_SUCCESS;
}
+#ifndef SLAP_NVALUES
+
/* Index generation function */
static int integerIndexer(
slap_mask_t use,
for( i=0; values[i].bv_val != NULL; i++ ) {
struct berval norm;
- integerNormalize( syntax, &values[i], &norm );
+ xintegerNormalize( syntax, &values[i], &norm );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
size_t slen, mlen;
slen = syntax->ssyn_oidlen;
mlen = mr->smr_oidlen;
- integerNormalize( syntax, assertValue, &norm );
+ xintegerNormalize( syntax, assertedValue, &norm );
keys = ch_malloc( sizeof( struct berval ) * 2 );
return LDAP_SUCCESS;
}
+#endif
static int
countryStringValidate(
}
}
- if( len == 0 ) LDAP_INVALID_SYNTAX;
+ if( len == 0 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
return LDAP_SUCCESS;
}
}
static int
+#ifdef SLAP_NVALUES
IA5StringNormalize(
+ slap_mask_t use,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *val,
+ struct berval *normalized )
+#else
+xIA5StringNormalize(
Syntax *syntax,
struct berval *val,
struct berval *normalized )
+#endif
{
char *p, *q;
+#ifdef SLAP_NVALUES
+ int casefold = !SLAP_MR_ASSOCIATED(mr, slap_schema.si_mr_caseExactIA5Match);
+#endif
assert( val->bv_len );
while ( ASCII_SPACE( *p ) ) {
p++;
}
+
+#ifdef SLAP_NVALUES
+ } else if ( casefold ) {
+ /* Most IA5 rules require casefolding */
+ *q++ = TOLOWER(*p++);
+#endif
+
} else {
*q++ = *p++;
}
return LDAP_SUCCESS;
}
+#ifndef SLAP_NVALUES
+
static int
caseExactIA5Match(
int *matchp,
}
static int
-caseExactIA5SubstringsMatch(
+caseExactIA5SubstringsMatch
+#else
+static int
+octetStringSubstringsMatch
+#endif
+(
int *matchp,
slap_mask_t flags,
Syntax *syntax,
goto done;
}
- match = strncmp( sub->sa_initial.bv_val, left.bv_val,
+ match = memcmp( sub->sa_initial.bv_val, left.bv_val,
sub->sa_initial.bv_len );
if( match != 0 ) {
goto done;
}
- match = strncmp( sub->sa_final.bv_val,
+ match = memcmp( sub->sa_final.bv_val,
&left.bv_val[left.bv_len - sub->sa_final.bv_len],
sub->sa_final.bv_len );
continue;
}
- p = strchr( left.bv_val, *sub->sa_any[i].bv_val );
+ p = memchr( left.bv_val, *sub->sa_any[i].bv_val, left.bv_len );
if( p == NULL ) {
match = 1;
goto done;
}
- match = strncmp( left.bv_val,
+ match = memcmp( left.bv_val,
sub->sa_any[i].bv_val,
sub->sa_any[i].bv_len );
return LDAP_SUCCESS;
}
+#ifndef SLAP_NVALUES
+
/* Index generation function */
static int caseExactIA5Indexer(
slap_mask_t use,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
size_t slen, mlen;
slen = syntax->ssyn_oidlen;
mlen = mr->smr_oidlen;
- value = (struct berval *) assertValue;
+ value = (struct berval *) assertedValue;
keys = ch_malloc( sizeof( struct berval ) * 2 );
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
- SubstringsAssertion *sa = assertValue;
+ SubstringsAssertion *sa = assertedValue;
char pre;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
if( rc != LDAP_SUCCESS ) {
break;
}
+#ifndef SLAP_NVALUES
} else if ( mr->smr_syntax->ssyn_normalize ) {
rc = (mr->smr_syntax->ssyn_normalize)( syntax, &values[i], &value );
if( rc != LDAP_SUCCESS ) {
break;
}
+#endif
} else {
ber_dupbv( &value, &values[i] );
}
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
size_t slen, mlen;
slen = syntax->ssyn_oidlen;
mlen = mr->smr_oidlen;
- ber_dupbv( &value, (struct berval *) assertValue );
+ ber_dupbv( &value, (struct berval *) assertedValue );
ldap_pvt_str2lower( value.bv_val );
keys = ch_malloc( sizeof( struct berval ) * 2 );
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
- SubstringsAssertion *sa = assertValue;
+ SubstringsAssertion *sa = assertedValue;
char pre;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
return LDAP_SUCCESS;
}
+#endif
+
static int
numericStringValidate(
Syntax *syntax,
}
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;
return LDAP_SUCCESS;
}
+#ifndef SLAP_NVALUES
static int
objectIdentifierFirstComponentMatch(
int *matchp,
int rc = LDAP_SUCCESS;
int match;
struct berval *asserted = (struct berval *) assertedValue;
- ber_len_t i;
+ ber_len_t i, j;
struct berval oid;
if( value->bv_len == 0 || value->bv_val[0] != '(' /*')'*/ ) {
/* grab next word */
oid.bv_val = &value->bv_val[i];
- oid.bv_len = value->bv_len - i;
- for( i=1; ASCII_SPACE(value->bv_val[i]) && i < oid.bv_len; i++ ) {
+ j = value->bv_len - i;
+ for( i=0; !ASCII_SPACE(oid.bv_val[i]) && i < j; i++ ) {
/* empty */
}
oid.bv_len = i;
match, value->bv_val, asserted->bv_val );
#endif
-
if( rc == LDAP_SUCCESS ) *matchp = match;
return rc;
}
+#endif
+
static int
integerBitAndMatch(
int *matchp,
long lValue, lAssertedValue;
/* safe to assume integers are NUL terminated? */
- lValue = strtoul(value->bv_val, NULL, 10);
- if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
+ lValue = strtol(value->bv_val, NULL, 10);
+ if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE ) {
return LDAP_CONSTRAINT_VIOLATION;
+ }
lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
- if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
+ if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX)
+ && errno == ERANGE )
+ {
return LDAP_CONSTRAINT_VIOLATION;
+ }
- *matchp = (lValue & lAssertedValue);
+ *matchp = (lValue & lAssertedValue) ? 0 : 1;
return LDAP_SUCCESS;
}
long lValue, lAssertedValue;
/* safe to assume integers are NUL terminated? */
- lValue = strtoul(value->bv_val, NULL, 10);
- if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
+ lValue = strtol(value->bv_val, NULL, 10);
+ if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE ) {
return LDAP_CONSTRAINT_VIOLATION;
+ }
lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
- if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
+ if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX)
+ && errno == ERANGE )
+ {
return LDAP_CONSTRAINT_VIOLATION;
+ }
- *matchp = (lValue | lAssertedValue);
+ *matchp = (lValue | lAssertedValue) ? 0 : -1;
return LDAP_SUCCESS;
}
+#ifndef SLAP_NVALUES
+
#ifdef HAVE_TLS
#include <openssl/x509.h>
#include <openssl/err.h>
-char digit[] = "0123456789";
/*
* Next function returns a string representation of a ASN1_INTEGER.
{
char buf[256];
char *p;
+ static char digit[] = "0123456789";
/* We work backwards, make it fill from the end of buf */
p = buf + sizeof(buf) - 1;
return NULL;
}
*--p = digit[carry];
- if (copy[base] == 0)
- base++;
+
+ if (copy[base] == 0) base++;
}
free(copy);
}
X509_free(xcert);
return LDAP_INVALID_SYNTAX;
}
- if ( dnX509normalize(X509_get_issuer_name(xcert), &issuer_dn ) != LDAP_SUCCESS ) {
+ if ( dnX509normalize(X509_get_issuer_name(xcert), &issuer_dn )
+ != LDAP_SUCCESS )
+ {
X509_free(xcert);
ber_memfree(serial.bv_val);
return LDAP_INVALID_SYNTAX;
begin = assertion->bv_val;
end = assertion->bv_val+assertion->bv_len-1;
- for (p=begin; p<=end && *p != '$'; p++)
- ;
- if ( p > end )
- return LDAP_INVALID_SYNTAX;
+ for (p=begin; p<=end && *p != '$'; p++) /* empty */ ;
+ if ( p > end ) return LDAP_INVALID_SYNTAX;
- /* p now points at the $ sign, now use begin and end to delimit the
- serial number */
- while (ASCII_SPACE(*begin))
- begin++;
+ /* p now points at the $ sign, now use
+ * begin and end to delimit the serial number
+ */
+ while (ASCII_SPACE(*begin)) begin++;
end = p-1;
- while (ASCII_SPACE(*end))
- end--;
+ while (ASCII_SPACE(*end)) end--;
+
+ if( end <= begin ) return LDAP_INVALID_SYNTAX;
bv.bv_len = end-begin+1;
bv.bv_val = begin;
ber_dupbv(serial, &bv);
/* now extract the issuer, remember p was at the dollar sign */
- if ( issuer_dn ) {
- begin = p+1;
- end = assertion->bv_val+assertion->bv_len-1;
- while (ASCII_SPACE(*begin))
- begin++;
- /* should we trim spaces at the end too? is it safe always? */
+ begin = p+1;
+ end = assertion->bv_val+assertion->bv_len-1;
+ while (ASCII_SPACE(*begin)) begin++;
+ /* should we trim spaces at the end too? is it safe always? no, no */
+
+ if( end <= begin ) return LDAP_INVALID_SYNTAX;
+ if ( issuer_dn ) {
bv.bv_len = end-begin+1;
bv.bv_val = begin;
+
dnNormalize2( NULL, &bv, issuer_dn );
}
X509_free(xcert);
serial_and_issuer_parse(assertedValue,
- &asserted_serial,
- &asserted_issuer_dn);
+ &asserted_serial, &asserted_issuer_dn);
ret = integerMatch(
matchp,
asn1_integer2str(xcert->cert_info->serialNumber, &serial);
X509_free(xcert);
- integerNormalize( slap_schema.si_syn_integer,
- &serial,
- &keys[i] );
+ xintegerNormalize( slap_schema.si_syn_integer,
+ &serial, &keys[i] );
ber_memfree(serial.bv_val);
#ifdef NEW_LOGGING
LDAP_LOG( CONFIG, ENTRY,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ void * assertedValue,
BerVarray *keysp )
{
BerVarray keys;
struct berval asserted_serial;
+ int ret;
- serial_and_issuer_parse(assertValue,
- &asserted_serial,
- NULL);
+ ret = serial_and_issuer_parse( assertedValue, &asserted_serial, NULL );
+ if( ret != LDAP_SUCCESS ) return ret;
keys = ch_malloc( sizeof( struct berval ) * 2 );
- integerNormalize( syntax, &asserted_serial, &keys[0] );
+ xintegerNormalize( syntax, &asserted_serial, &keys[0] );
keys[1].bv_val = NULL;
*keysp = keys;
return LDAP_SUCCESS;
}
#endif
+#endif
static int
check_time_syntax (struct berval *val,
#ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
static int
-utcTimeNormalize(
+xutcTimeNormalize(
Syntax *syntax,
struct berval *val,
struct berval *normalized )
}
static int
+#ifdef SLAP_NVALUES
generalizedTimeNormalize(
+ slap_mask_t usage,
Syntax *syntax,
+ MatchingRule *mr,
struct berval *val,
struct berval *normalized )
+#else
+xgeneralizedTimeNormalize(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *normalized )
+#endif
{
int parts[9], rc;
return LDAP_SUCCESS;
}
-static struct syntax_defs_rec {
- char *sd_desc;
#define X_BINARY "X-BINARY-TRANSFER-REQUIRED 'TRUE' "
#define X_NOT_H_R "X-NOT-HUMAN-READABLE 'TRUE' "
- int sd_flags;
- slap_syntax_validate_func *sd_validate;
- slap_syntax_transform_func *sd_normalize;
- slap_syntax_transform_func *sd_pretty;
-#ifdef SLAPD_BINARY_CONVERSION
- slap_syntax_transform_func *sd_ber2str;
- slap_syntax_transform_func *sd_str2ber;
-#endif
-} syntax_defs[] = {
+
+static slap_syntax_defs_rec syntax_defs[] = {
{"( 1.3.6.1.4.1.1466.115.121.1.1 DESC 'ACI Item' "
X_BINARY X_NOT_H_R ")",
SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL, NULL},
X_NOT_H_R ")",
SLAP_SYNTAX_BER, berValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' )",
- 0, bitStringValidate, bitStringNormalize, NULL },
+ 0, bitStringValidate, NULL, NULL },
{"( 1.3.6.1.4.1.1466.115.121.1.7 DESC 'Boolean' )",
0, booleanValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.8 DESC 'Certificate' "
X_BINARY X_NOT_H_R ")",
SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, berValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.11 DESC 'Country String' )",
- 0, countryStringValidate, IA5StringNormalize, NULL},
+ 0, countryStringValidate, xIA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'Distinguished Name' )",
- 0, dnValidate, dnNormalize2, dnPretty2},
+ 0, dnValidate, xdnNormalize, dnPretty2},
{"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'Delivery Method' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'Directory String' )",
- 0, UTF8StringValidate, UTF8StringNormalize, NULL},
+ 0, UTF8StringValidate, xUTF8StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.16 DESC 'DIT Content Rule Description' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.17 DESC 'DIT Structure Rule Description' )",
{"( 1.3.6.1.4.1.1466.115.121.1.21 DESC 'Enhanced Guide' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.22 DESC 'Facsimile Telephone Number' )",
- 0, printablesStringValidate, telephoneNumberNormalize, NULL},
+ 0, printablesStringValidate, xtelephoneNumberNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.23 DESC 'Fax' " X_NOT_H_R ")",
SLAP_SYNTAX_BLOB, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.24 DESC 'Generalized Time' )",
- 0, generalizedTimeValidate, generalizedTimeNormalize, NULL},
+ 0, generalizedTimeValidate, xgeneralizedTimeNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.25 DESC 'Guide' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.26 DESC 'IA5 String' )",
- 0, IA5StringValidate, IA5StringNormalize, NULL},
+ 0, IA5StringValidate, xIA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.27 DESC 'Integer' )",
- 0, integerValidate, integerNormalize, NULL},
+ 0, integerValidate, xintegerNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.28 DESC 'JPEG' " X_NOT_H_R ")",
SLAP_SYNTAX_BLOB, blobValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.29 DESC 'Master And Shadow Access Points' )",
{"( 1.3.6.1.4.1.1466.115.121.1.33 DESC 'MHS OR Address' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'Name And Optional UID' )",
- 0, nameUIDValidate, nameUIDNormalize, NULL},
+ 0, nameUIDValidate, xnameUIDNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.35 DESC 'Name Form Description' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.36 DESC 'Numeric String' )",
- 0, numericStringValidate, numericStringNormalize, NULL},
+ 0, numericStringValidate, xnumericStringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.37 DESC 'Object Class Description' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.38 DESC 'OID' )",
0, oidValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.39 DESC 'Other Mailbox' )",
- 0, IA5StringValidate, IA5StringNormalize, NULL},
+ 0, IA5StringValidate, xIA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.40 DESC 'Octet String' )",
0, blobValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.41 DESC 'Postal Address' )",
- 0, UTF8StringValidate, UTF8StringNormalize, NULL},
+ 0, UTF8StringValidate, xUTF8StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.42 DESC 'Protocol Information' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.43 DESC 'Presentation Address' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.44 DESC 'Printable String' )",
- 0, printableStringValidate, IA5StringNormalize, NULL},
+ 0, printableStringValidate, xIA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.45 DESC 'SubtreeSpecification' "
X_BINARY X_NOT_H_R ")",
SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL, NULL},
X_BINARY X_NOT_H_R ")",
SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, berValidate, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.50 DESC 'Telephone Number' )",
- 0, printableStringValidate, telephoneNumberNormalize, NULL},
+ 0, printableStringValidate, xtelephoneNumberNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.51 DESC 'Teletex Terminal Identifier' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.52 DESC 'Telex Number' )",
- 0, printablesStringValidate, IA5StringNormalize, NULL},
+ 0, printablesStringValidate, xIA5StringNormalize, NULL},
#ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
{"( 1.3.6.1.4.1.1466.115.121.1.53 DESC 'UTC Time' )",
- 0, utcTimeValidate, utcTimeNormalize, NULL},
+ 0, utcTimeValidate, xutcTimeNormalize, NULL},
#endif
{"( 1.3.6.1.4.1.1466.115.121.1.54 DESC 'LDAP Syntax Description' )",
0, NULL, NULL, NULL},
* Chadwick in private mail.
*/
{"( 1.2.826.0.1.3344810.7.1 DESC 'Serial Number and Issuer' )",
- 0, NULL, NULL, NULL},
+ 0, UTF8StringValidate, NULL, NULL},
#endif
/* OpenLDAP Experimental Syntaxes */
{NULL, 0, NULL, NULL, NULL}
};
+#ifdef HAVE_TLS
+char *certificateExactMatchSyntaxes[] = {
+ "1.3.6.1.4.1.1466.115.121.1.8" /* certificate */,
+ NULL
+};
+#endif
+char *directoryStringSyntaxes[] = {
+ "1.3.6.1.4.1.1466.115.121.1.44" /* printableString */,
+ NULL
+};
+char *integerFirstComponentMatchSyntaxes[] = {
+ "1.3.6.1.4.1.1466.115.121.1.27" /* INTEGER */,
+ "1.3.6.1.4.1.1466.115.121.1.17" /* ditStructureRuleDescription */,
+ NULL
+};
+char *objectIdentifierFirstComponentMatchSyntaxes[] = {
+ "1.3.6.1.4.1.1466.115.121.1.38" /* OID */,
+ "1.3.6.1.4.1.1466.115.121.1.3" /* attributeTypeDescription */,
+ "1.3.6.1.4.1.1466.115.121.1.16" /* ditContentRuleDescription */,
+ "1.3.6.1.4.1.1466.115.121.1.54" /* ldapSyntaxDescription */,
+ "1.3.6.1.4.1.1466.115.121.1.30" /* matchingRuleDescription */,
+ "1.3.6.1.4.1.1466.115.121.1.31" /* matchingRuleUseDescription */,
+ "1.3.6.1.4.1.1466.115.121.1.35" /* nameFormDescription */,
+ "1.3.6.1.4.1.1466.115.121.1.37" /* objectClassDescription */,
+ NULL
+};
+
/*
* Other matching rules in X.520 that we do not use (yet):
*
* 2.5.13.9 numericStringOrderingMatch
- * 2.5.13.18 octetStringOrderingMatch
- * 2.5.13.19 octetStringSubstringsMatch
* 2.5.13.25 uTCTimeMatch
* 2.5.13.26 uTCTimeOrderingMatch
* 2.5.13.31 directoryStringFirstComponentMatch
* 2.5.13.43 readerAndKeyIDMatch
* 2.5.13.44 attributeIntegrityMatch
*/
-static struct mrule_defs_rec {
- char * mrd_desc;
- slap_mask_t mrd_usage;
- slap_mr_convert_func * mrd_convert;
- slap_mr_normalize_func * mrd_normalize;
- slap_mr_match_func * mrd_match;
- slap_mr_indexer_func * mrd_indexer;
- slap_mr_filter_func * mrd_filter;
-
- char * mrd_associated;
-} mrule_defs[] = {
+static slap_mrule_defs_rec mrule_defs[] = {
/*
* EQUALITY matching rules must be listed after associated APPROX
* matching rules. So, we list all APPROX matching rules first.
*/
+#ifndef SLAP_NVALUES
{"( " directoryStringApproxMatchOID " NAME 'directoryStringApproxMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
- SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT,
- NULL, NULL,
- directoryStringApproxMatch,
- directoryStringApproxIndexer,
- directoryStringApproxFilter,
+ SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT, NULL,
+ NULL, NULL, directoryStringApproxMatch,
+ directoryStringApproxIndexer, directoryStringApproxFilter,
NULL},
{"( " IA5StringApproxMatchOID " NAME 'IA5StringApproxMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
- SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT,
- NULL, NULL,
- IA5StringApproxMatch,
- IA5StringApproxIndexer,
- IA5StringApproxFilter,
+ SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT, NULL,
+ NULL, NULL, IA5StringApproxMatch,
+ IA5StringApproxIndexer, IA5StringApproxFilter,
NULL},
+#endif
/*
* Other matching rules
{"( 2.5.13.0 NAME 'objectIdentifierMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- objectIdentifierMatch, caseIgnoreIA5Indexer, caseIgnoreIA5Filter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ objectIdentifierNormalize, objectIdentifierMatch,
+ objectIdentifierIndexer, objectIdentifierFilter,
NULL},
{"( 2.5.13.1 NAME 'distinguishedNameMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- dnMatch, dnIndexer, dnFilter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ distinguishedNameNormalize, distinguishedNameMatch,
+ distinguishedNameIndexer, distinguishedNameFilter,
NULL},
{"( 2.5.13.2 NAME 'caseIgnoreMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
- NULL, NULL,
- caseIgnoreMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
+ directoryStringSyntaxes,
+ NULL,
+ caseIgnoreNormalize, caseIgnoreMatch,
+ caseIgnoreIndexer, caseIgnoreFilter,
directoryStringApproxMatchOID },
{"( 2.5.13.3 NAME 'caseIgnoreOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
- SLAP_MR_ORDERING,
- NULL, NULL,
- caseIgnoreOrderingMatch, NULL, NULL,
- NULL},
+ SLAP_MR_ORDERING, directoryStringSyntaxes,
+ NULL, caseIgnoreNormalize, caseIgnoreOrderingMatch,
+ NULL, NULL, NULL},
{"( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
- SLAP_MR_SUBSTR | SLAP_MR_EXT,
+ SLAP_MR_SUBSTR, NULL,
NULL, NULL,
- caseExactIgnoreSubstringsMatch,
- caseExactIgnoreSubstringsIndexer,
- caseExactIgnoreSubstringsFilter,
+ caseIgnoreSubstringsMatch,
+ caseIgnoreSubstringsIndexer, caseIgnoreSubstringsFilter,
NULL},
{"( 2.5.13.5 NAME 'caseExactMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- caseExactMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, directoryStringSyntaxes,
+ NULL,
+ caseExactNormalize, caseExactMatch,
+ caseExactIndexer, caseExactFilter,
directoryStringApproxMatchOID },
{"( 2.5.13.6 NAME 'caseExactOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
- SLAP_MR_ORDERING,
- NULL, NULL,
- caseExactOrderingMatch, NULL, NULL,
- NULL},
+ SLAP_MR_ORDERING, directoryStringSyntaxes,
+ NULL, caseExactNormalize, caseExactOrderingMatch,
+ NULL, NULL, NULL},
{"( 2.5.13.7 NAME 'caseExactSubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
- SLAP_MR_SUBSTR | SLAP_MR_EXT,
- NULL, NULL,
- caseExactIgnoreSubstringsMatch,
- caseExactIgnoreSubstringsIndexer,
- caseExactIgnoreSubstringsFilter,
+ SLAP_MR_SUBSTR, directoryStringSyntaxes,
+ NULL,
+ NULL, caseExactSubstringsMatch,
+ caseExactSubstringsIndexer, caseExactSubstringsFilter,
NULL},
{"( 2.5.13.8 NAME 'numericStringMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
- NULL, NULL,
- caseIgnoreIA5Match,
- caseIgnoreIA5Indexer,
- caseIgnoreIA5Filter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD, NULL,
+ NULL,
+ numericStringNormalize, numericStringMatch,
+ numericStringIndexer, numericStringFilter,
NULL},
{"( 2.5.13.10 NAME 'numericStringSubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
- SLAP_MR_SUBSTR | SLAP_MR_EXT,
- NULL, NULL,
- caseIgnoreIA5SubstringsMatch,
- caseIgnoreIA5SubstringsIndexer,
- caseIgnoreIA5SubstringsFilter,
+ SLAP_MR_SUBSTR, NULL,
+ NULL,
+ NULL, numericStringSubstringsMatch,
+ numericStringSubstringsIndexer, numericStringSubstringsFilter,
NULL},
{"( 2.5.13.11 NAME 'caseIgnoreListMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
- NULL, NULL,
- caseIgnoreListMatch, NULL, NULL,
- NULL},
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL},
{"( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
- SLAP_MR_SUBSTR | SLAP_MR_EXT,
- NULL, NULL,
- caseIgnoreListSubstringsMatch, NULL, NULL,
- NULL},
+ SLAP_MR_SUBSTR, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL},
{"( 2.5.13.13 NAME 'booleanMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- booleanMatch, NULL, NULL,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ NULL, booleanMatch,
+ booleanIndexer, booleanFilter,
NULL},
{"( 2.5.13.14 NAME 'integerMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- integerMatch, integerIndexer, integerFilter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ integerNormalize, integerMatch,
+ integerIndexer, integerFilter,
NULL},
{"( 2.5.13.15 NAME 'integerOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
- SLAP_MR_ORDERING,
- NULL, NULL,
- integerOrderingMatch, NULL, NULL,
+ SLAP_MR_ORDERING, NULL, NULL,
+ integerNormalize, integerOrderingMatch,
+ integerIndexer, integerFilter,
NULL},
{"( 2.5.13.16 NAME 'bitStringMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- bitStringMatch, bitStringIndexer, bitStringFilter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ NULL, bitStringMatch,
+ bitStringIndexer, bitStringFilter,
NULL},
{"( 2.5.13.17 NAME 'octetStringMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
NULL, NULL,
octetStringMatch, octetStringIndexer, octetStringFilter,
NULL},
+ {"( 2.5.13.18 NAME 'octetStringOrderingMatch' "
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
+ SLAP_MR_ORDERING, NULL,
+ NULL, NULL,
+ octetStringOrderingMatch, NULL, NULL,
+ NULL},
+
+ {"( 2.5.13.19 NAME 'octetStringSubstringsMatch' "
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
+ SLAP_MR_SUBSTR, NULL,
+ NULL, NULL,
+ octetStringSubstringsMatch, NULL, NULL,
+ NULL},
+
{"( 2.5.13.20 NAME 'telephoneNumberMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
- NULL, NULL,
- telephoneNumberMatch,
- telephoneNumberIndexer,
- telephoneNumberFilter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD, NULL,
+ NULL,
+ telephoneNumberNormalize, telephoneNumberMatch,
+ telephoneNumberIndexer, telephoneNumberFilter,
NULL},
{"( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
- SLAP_MR_SUBSTR | SLAP_MR_EXT,
- NULL, NULL,
- telephoneNumberSubstringsMatch,
- telephoneNumberSubstringsIndexer,
- telephoneNumberSubstringsFilter,
+ SLAP_MR_SUBSTR, NULL,
+ NULL, NULL, telephoneNumberSubstringsMatch,
+ telephoneNumberSubstringsIndexer, telephoneNumberSubstringsFilter,
NULL},
{"( 2.5.13.22 NAME 'presentationAddressMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL},
{"( 2.5.13.23 NAME 'uniqueMemberMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ uniqueMemberNormalize, uniqueMemberMatch,
NULL, NULL,
- uniqueMemberMatch, NULL, NULL,
NULL},
{"( 2.5.13.24 NAME 'protocolInformationMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- protocolInformationMatch, NULL, NULL,
- NULL},
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL},
{"( 2.5.13.27 NAME 'generalizedTimeMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ generalizedTimeNormalize, generalizedTimeMatch,
NULL, NULL,
- generalizedTimeMatch, NULL, NULL,
NULL},
{"( 2.5.13.28 NAME 'generalizedTimeOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )",
- SLAP_MR_ORDERING,
+ SLAP_MR_ORDERING, NULL,
+ NULL,
+ generalizedTimeNormalize, generalizedTimeOrderingMatch,
NULL, NULL,
- generalizedTimeOrderingMatch, NULL, NULL,
NULL},
{"( 2.5.13.29 NAME 'integerFirstComponentMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, integerFirstComponentMatchSyntaxes,
+ NULL,
+ integerFirstComponentNormalize, integerMatch,
NULL, NULL,
- integerFirstComponentMatch, NULL, NULL,
NULL},
{"( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ objectIdentifierFirstComponentMatchSyntaxes,
+ NULL,
+ objectIdentifierFirstComponentNormalize, objectIdentifierMatch,
NULL, NULL,
- objectIdentifierFirstComponentMatch, NULL, NULL,
NULL},
+#ifndef SLAP_NVALUES
#ifdef HAVE_TLS
{"( 2.5.13.34 NAME 'certificateExactMatch' "
"SYNTAX 1.2.826.0.1.3344810.7.1 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, certificateExactMatchSyntaxes,
certificateExactConvert, NULL,
certificateExactMatch,
certificateExactIndexer, certificateExactFilter,
NULL},
+#endif
#endif
{"( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT,
- NULL, NULL,
- caseExactIA5Match, caseExactIA5Indexer, caseExactIA5Filter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+ NULL,
+ caseExactIA5Normalize, caseExactIA5Match,
+ caseExactIA5Indexer, caseExactIA5Filter,
IA5StringApproxMatchOID },
{"( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
- SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
- NULL, NULL,
- caseIgnoreIA5Match, caseIgnoreIA5Indexer, caseIgnoreIA5Filter,
+ SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD, NULL,
+ NULL,
+ NULL, caseIgnoreIA5Match,
+ caseIgnoreIA5Indexer, caseIgnoreIA5Filter,
IA5StringApproxMatchOID },
{"( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
- SLAP_MR_SUBSTR,
- NULL, NULL,
- caseIgnoreIA5SubstringsMatch,
- caseIgnoreIA5SubstringsIndexer,
- caseIgnoreIA5SubstringsFilter,
+ SLAP_MR_SUBSTR, NULL,
+ NULL,
+ NULL, caseIgnoreIA5SubstringsMatch,
+ caseIgnoreIA5SubstringsIndexer, caseIgnoreIA5SubstringsFilter,
NULL},
{"( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
- SLAP_MR_SUBSTR,
- NULL, NULL,
- caseExactIA5SubstringsMatch,
- caseExactIA5SubstringsIndexer,
- caseExactIA5SubstringsFilter,
+ SLAP_MR_SUBSTR, NULL,
+ NULL,
+ NULL, caseExactIA5SubstringsMatch,
+ caseExactIA5SubstringsIndexer, caseExactIA5SubstringsFilter,
NULL},
#ifdef SLAPD_AUTHPASSWD
/* needs updating */
{"( 1.3.6.1.4.1.4203.666.4.1 NAME 'authPasswordMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
- SLAP_MR_EQUALITY,
+ SLAP_MR_EQUALITY, NULL,
NULL, NULL,
authPasswordMatch, NULL, NULL,
NULL},
#ifdef SLAPD_ACI_ENABLED
{"( 1.3.6.1.4.1.4203.666.4.2 NAME 'OpenLDAPaciMatch' "
"SYNTAX 1.3.6.1.4.1.4203.666.2.1 )",
- SLAP_MR_EQUALITY,
+ SLAP_MR_EQUALITY, NULL,
NULL, NULL,
OpenLDAPaciMatch, NULL, NULL,
NULL},
{"( 1.2.840.113556.1.4.803 NAME 'integerBitAndMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
- SLAP_MR_EXT,
- NULL, NULL,
- integerBitAndMatch, NULL, NULL,
+ SLAP_MR_EXT, NULL,
+ NULL,
+ NULL, integerBitAndMatch, NULL, NULL,
NULL},
{"( 1.2.840.113556.1.4.804 NAME 'integerBitOrMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
- SLAP_MR_EXT,
- NULL, NULL,
- integerBitOrMatch, NULL, NULL,
+ SLAP_MR_EXT, NULL,
+ NULL,
+ NULL, integerBitOrMatch, NULL, NULL,
NULL},
- {NULL, SLAP_MR_NONE, NULL, NULL, NULL, NULL}
+ {NULL, SLAP_MR_NONE, NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL }
};
int
assert( schema_init_done == 0 );
for ( i=0; syntax_defs[i].sd_desc != NULL; i++ ) {
- res = register_syntax( syntax_defs[i].sd_desc,
- syntax_defs[i].sd_flags,
- syntax_defs[i].sd_validate,
- syntax_defs[i].sd_normalize,
- syntax_defs[i].sd_pretty
-#ifdef SLAPD_BINARY_CONVERSION
- ,
- syntax_defs[i].sd_ber2str,
- syntax_defs[i].sd_str2ber
-#endif
- );
+ res = register_syntax( &syntax_defs[i] );
if ( res ) {
fprintf( stderr, "slap_schema_init: Error registering syntax %s\n",
}
for ( i=0; mrule_defs[i].mrd_desc != NULL; i++ ) {
- if( mrule_defs[i].mrd_usage == SLAP_MR_NONE ) {
+ if( mrule_defs[i].mrd_usage == SLAP_MR_NONE &&
+ mrule_defs[i].mrd_compat_syntaxes == NULL )
+ {
fprintf( stderr,
- "slap_schema_init: Ingoring unusable matching rule %s\n",
+ "slap_schema_init: Ignoring unusable matching rule %s\n",
mrule_defs[i].mrd_desc );
continue;
}
- res = register_matching_rule(
- mrule_defs[i].mrd_desc,
- mrule_defs[i].mrd_usage,
- mrule_defs[i].mrd_convert,
- mrule_defs[i].mrd_normalize,
- mrule_defs[i].mrd_match,
- mrule_defs[i].mrd_indexer,
- mrule_defs[i].mrd_filter,
- mrule_defs[i].mrd_associated );
+ res = register_matching_rule( &mrule_defs[i] );
if ( res ) {
fprintf( stderr,
}
}
- for ( i=0; i < (int)(sizeof(mr_ptr)/sizeof(mr_ptr[0])); i++ )
- *mr_ptr[i].mr = mr_find( mr_ptr[i].oid );
-
res = slap_schema_load();
schema_init_done = 1;
return res;
oidm_destroy();
oc_destroy();
at_destroy();
- for ( i=0; i < (int)(sizeof(mr_ptr)/sizeof(mr_ptr[0])); i++ )
- *mr_ptr[i].mr = NULL;
mr_destroy();
+ mru_destroy();
syn_destroy();
}
projects / openldap / blobdiff