#include "portable.h"
#include <stdio.h>
+#include <limits.h>
#include <ac/ctype.h>
+#include <ac/errno.h>
#include <ac/string.h>
#include <ac/socket.h>
#include "slap.h"
#include "ldap_pvt.h"
-#include "lutil_md5.h"
-/* recycled validatation routines */
-#define berValidate blobValidate
-#define nameUIDValidate dnValidate
+#include "ldap_utf8.h"
-/* unimplemented validators */
-#define bitStringValidate NULL
+#include "lutil_hash.h"
+/* We should replace MD5 with a faster hash */
+#define HASH_BYTES LUTIL_HASH_BYTES
+#define HASH_CONTEXT lutil_HASH_CTX
+#define HASH_Init(c) lutil_HASHInit(c)
+#define HASH_Update(c,buf,len) lutil_HASHUpdate(c,buf,len)
+#define HASH_Final(d,c) lutil_HASHFinal(d,c)
-/* recycled normalization routines */
-#define faxNumberNormalize numericStringNormalize
-#define phoneNumberNormalize numericStringNormalize
-#define telexNumberNormalize numericStringNormalize
-#define integerNormalize numericStringNormalize
-#define nameUIDNormalize dnNormalize
-
-/* unimplemented normalizers */
-#define bitStringNormalize NULL
+/* recycled validatation routines */
+#define berValidate blobValidate
/* unimplemented pretters */
#define dnPretty NULL
#define integerPretty NULL
-/* recyclied pretters */
-#define nameUIDPretty dnPretty
-
/* recycled matching routines */
-#define numericStringMatch caseIgnoreMatch
-#define objectIdentifierMatch numericStringMatch
-#define integerMatch numericStringMatch
-#define telephoneNumberMatch numericStringMatch
+#define bitStringMatch octetStringMatch
+#define numericStringMatch caseIgnoreIA5Match
+#define objectIdentifierMatch caseIgnoreIA5Match
+#define telephoneNumberMatch caseIgnoreIA5Match
#define telephoneNumberSubstringsMatch caseIgnoreIA5SubstringsMatch
-#define generalizedTimeMatch numericStringMatch
-#define generalizedTimeOrderingMatch numericStringMatch
+#define generalizedTimeMatch caseIgnoreIA5Match
+#define generalizedTimeOrderingMatch caseIgnoreIA5Match
#define uniqueMemberMatch dnMatch
/* approx matching rules */
#define directoryStringApproxMatchOID "1.3.6.1.4.1.4203.666.4.4"
-#define directoryStringApproxMatch NULL
+#define directoryStringApproxMatch approxMatch
+#define directoryStringApproxIndexer approxIndexer
+#define directoryStringApproxFilter approxFilter
#define IA5StringApproxMatchOID "1.3.6.1.4.1.4203.666.4.5"
-#define IA5StringApproxMatch NULL
+#define IA5StringApproxMatch approxMatch
+#define IA5StringApproxIndexer approxIndexer
+#define IA5StringApproxFilter approxFilter
/* orderring matching rules */
#define caseIgnoreOrderingMatch caseIgnoreMatch
/* unimplemented matching routines */
#define caseIgnoreListMatch NULL
#define caseIgnoreListSubstringsMatch NULL
-#define bitStringMatch NULL
-#define presentationAddressMatch NULL
#define protocolInformationMatch NULL
#define integerFirstComponentMatch NULL
#define authPasswordMatch NULL
/* recycled indexing/filtering routines */
-#define dnIndexer caseIgnoreIndexer
-#define dnFilter caseIgnoreFilter
+#define dnIndexer caseExactIgnoreIndexer
+#define dnFilter caseExactIgnoreFilter
+
+#define telephoneNumberIndexer caseIgnoreIA5Indexer
+#define telephoneNumberFilter caseIgnoreIA5Filter
+#define telephoneNumberSubstringsIndexer caseIgnoreIA5SubstringsIndexer
+#define telephoneNumberSubstringsFilter caseIgnoreIA5SubstringsFilter
+
+/* must match OIDs below */
+#define caseExactMatchOID "2.5.13.5"
+#define caseExactSubstringsMatchOID "2.5.13.7"
static char *strcasechr( const char *str, int c )
{
int i;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
for( i=0; values[i] != NULL; i++ ) {
/* just count them */
}
+ /* we should have at least one value at this point */
assert( i > 0 );
keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
mlen = strlen( mr->smr_oid );
for( i=0; values[i] != NULL; i++ ) {
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
values[i]->bv_val, values[i]->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[i] = ber_bvdup( &digest );
}
{
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval *value = (struct berval *) assertValue;
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
keys = ch_malloc( sizeof( struct berval * ) * 2 );
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[0] = ber_bvdup( &digest );
keys[1] = NULL;
dn = ch_strdup( in->bv_val );
- rc = dn_validate( dn ) == NULL
- ? LDAP_INVALID_SYNTAX : LDAP_SUCCESS;
+ if( dn == NULL ) {
+ return LDAP_INVALID_SYNTAX;
+
+ } else if ( strlen( in->bv_val ) != in->bv_len ) {
+ rc = LDAP_INVALID_SYNTAX;
+
+ } else if ( dn_validate( dn ) == NULL ) {
+ rc = LDAP_INVALID_SYNTAX;
+
+ } else {
+ rc = LDAP_SUCCESS;
+ }
ch_free( dn );
return rc;
}
-static int
+int
dnNormalize(
Syntax *syntax,
struct berval *val,
struct berval **normalized )
{
- struct berval *out = ber_bvdup( val );
+ struct berval *out;
- if( out->bv_len != 0 ) {
+ if ( val->bv_len != 0 ) {
char *dn;
-#ifdef USE_DN_NORMALIZE
- dn = dn_normalize( out->bv_val );
-#else
+ out = ber_bvstr( UTF8normalize( val->bv_val, UTF8_CASEFOLD ) );
+
dn = dn_validate( out->bv_val );
-#endif
if( dn == NULL ) {
ber_bvfree( out );
out->bv_val = dn;
out->bv_len = strlen( dn );
+ } else {
+ out = ber_bvdup( val );
}
*normalized = out;
#endif
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "dnMatch: %d\n %s\n %s\n", match,
+ value->bv_val, asserted->bv_val ));
+#else
Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
- match, value->bv_val, asserted->bv_val );
+ match, value->bv_val, asserted->bv_val );
+#endif
+
*matchp = match;
return LDAP_SUCCESS;
}
+static int
+nameUIDValidate(
+ Syntax *syntax,
+ struct berval *in )
+{
+ int rc;
+ struct berval *dn;
+
+ if( in->bv_len == 0 ) return LDAP_SUCCESS;
+
+ dn = ber_bvdup( in );
+
+ if( dn->bv_val[dn->bv_len-1] == '\'' ) {
+ /* assume presence of optional UID */
+ ber_len_t i;
+
+ for(i=dn->bv_len-2; i>2; i--) {
+ if( dn->bv_val[i] != '0' && dn->bv_val[i] != '1' ) {
+ break;
+ }
+ }
+ if( dn->bv_val[i] != '\'' ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ if( dn->bv_val[i-1] != 'B' ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ if( dn->bv_val[i-2] != '#' ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ /* trim the UID to allow use of dn_validate */
+ dn->bv_val[i-2] = '\0';
+ }
+
+ rc = dn_validate( dn->bv_val ) == NULL
+ ? LDAP_INVALID_SYNTAX : LDAP_SUCCESS;
+
+ ber_bvfree( dn );
+ return rc;
+}
+
+static int
+nameUIDNormalize(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval **normalized )
+{
+ struct berval *out = ber_bvdup( val );
+
+ if( out->bv_len != 0 ) {
+ char *dn;
+ ber_len_t dnlen;
+ char *uid = NULL;
+ ber_len_t uidlen = 0;
+
+ if( out->bv_val[out->bv_len-1] == '\'' ) {
+ /* assume presence of optional UID */
+ uid = strrchr( out->bv_val, '#' );
+
+ if( uid == NULL ) {
+ ber_bvfree( out );
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ uidlen = out->bv_len - (out->bv_val - uid);
+ /* temporarily trim the UID */
+ *uid = '\0';
+ }
+
+#ifdef USE_DN_NORMALIZE
+ dn = dn_normalize( out->bv_val );
+#else
+ dn = dn_validate( out->bv_val );
+#endif
+
+ if( dn == NULL ) {
+ ber_bvfree( out );
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ dnlen = strlen(dn);
+
+ if( uidlen ) {
+ /* restore the separator */
+ *uid = '#';
+ /* shift the UID */
+ SAFEMEMCPY( &dn[dnlen], uid, uidlen );
+ }
+
+ out->bv_val = dn;
+ out->bv_len = dnlen + uidlen;
+ }
+
+ *normalized = out;
+ return LDAP_SUCCESS;
+}
+
static int
inValidate(
Syntax *syntax,
return LDAP_SUCCESS;
}
+static int
+bitStringValidate(
+ Syntax *syntax,
+ struct berval *in )
+{
+ ber_len_t i;
+
+ /* very unforgiving validation, requires no normalization
+ * before simplistic matching
+ */
+ if( in->bv_len < 3 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ if( in->bv_val[0] != 'B' ||
+ in->bv_val[1] != '\'' ||
+ in->bv_val[in->bv_len-1] != '\'' )
+ {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ for( i=in->bv_len-2; i>1; i-- ) {
+ if( in->bv_val[i] != '0' && in->bv_val[i] != '1' ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ return LDAP_SUCCESS;
+}
+
/*
* Handling boolean syntax and matching is quite rigid.
* A more flexible approach would be to allow a variety
return LDAP_SUCCESS;
}
-#if 0
-static int
-UTF8casecmp(
- struct berval *right,
- struct berval *left )
-{
- ber_len_t r, l;
- int rlen, llen;
- ldap_unicode_t ru, lu;
- ldap_unicode_t ruu, luu;
-
- for( r=0, l=0;
- r < right->bv_len && l < left->bv_len;
- r+=rlen, l+=llen )
- {
- /*
- * XXYYZ: we convert to ucs4 even though -llunicode
- * expects ucs2 in an unsigned long
- */
- ru = ldap_utf8_to_ucs4( &right->bv_val[r] );
- if( ru == LDAP_UCS4_INVALID ) {
- return 1;
- }
-
- lu = ldap_utf8_to_ucs4( &left->bv_val[l] );
- if( lu == LDAP_UCS4_INVALID ) {
- return -1;
- }
-
- ruu = uctoupper( ru );
- luu = uctoupper( lu );
-
- if( ruu > luu ) {
- return 1;
- } else if( luu > ruu ) {
- return -1;
- }
-
- rlen = LDAP_UTF8_CHARLEN( &right->bv_val[r] );
- llen = LDAP_UTF8_CHARLEN( &left->bv_val[l] );
- }
-
- if( r < right->bv_len ) {
- /* less left */
- return -1;
- }
-
- if( l < left->bv_len ) {
- /* less right */
- return 1;
- }
-
- return 0;
-}
-#endif
-
static int
UTF8StringValidate(
Syntax *syntax,
assert( *newval->bv_val );
assert( newval->bv_val < p );
- assert( p >= q );
+ assert( q <= p );
/* cannot start with a space */
assert( !ldap_utf8_isspace(newval->bv_val) );
return LDAP_SUCCESS;
}
-static int
-caseExactMatch(
- int *matchp,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *value,
- void *assertedValue )
+/* Returns Unicode cannonically normalized copy of a substring assertion
+ * Skipping attribute description */
+SubstringsAssertion *
+UTF8SubstringsassertionNormalize(
+ SubstringsAssertion *sa,
+ char casefold )
{
- int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
+ SubstringsAssertion *nsa;
+ int i;
- if( match == 0 ) {
- match = strncmp( value->bv_val,
- ((struct berval *) assertedValue)->bv_val,
- value->bv_len );
+ nsa = (SubstringsAssertion *)ch_calloc( 1, sizeof(SubstringsAssertion) );
+ if( nsa == NULL ) {
+ return NULL;
}
- *matchp = match;
- return LDAP_SUCCESS;
+ if( sa->sa_initial != NULL ) {
+ nsa->sa_initial = ber_bvstr( UTF8normalize( sa->sa_initial->bv_val, casefold ) );
+ if( nsa->sa_initial == NULL ) {
+ goto err;
+ }
+ }
+
+ if( sa->sa_any != NULL ) {
+ for( i=0; sa->sa_any[i] != NULL; i++ ) {
+ /* empty */
+ }
+ nsa->sa_any = (struct berval **)ch_malloc( (i + 1) * sizeof(struct berval *) );
+ for( i=0; sa->sa_any[i] != NULL; i++ ) {
+ nsa->sa_any[i] = ber_bvstr( UTF8normalize( sa->sa_any[i]->bv_val, casefold ) );
+ if( nsa->sa_any[i] == NULL ) {
+ goto err;
+ }
+ }
+ nsa->sa_any[i] = NULL;
+ }
+
+ if( sa->sa_final != NULL ) {
+ nsa->sa_final = ber_bvstr( UTF8normalize( sa->sa_final->bv_val, casefold ) );
+ if( nsa->sa_final == NULL ) {
+ goto err;
+ }
+ }
+
+ return nsa;
+
+err:
+ ch_free( nsa->sa_final );
+ ber_bvecfree( nsa->sa_any );
+ ch_free( nsa->sa_initial );
+ ch_free( nsa );
+ return NULL;
+}
+
+/* Strip characters with the 8th bit set */
+char *
+strip8bitChars(
+ char *in )
+{
+ char *p = in, *q;
+
+ if( in == NULL ) {
+ return NULL;
+ }
+ while( *p ) {
+ if( *p & 0x80 ) {
+ q = p;
+ while( *++q & 0x80 ) {
+ /* empty */
+ }
+ p = memmove(p, q, strlen(q) + 1);
+ } else {
+ p++;
+ }
+ }
+ return in;
}
+#ifndef SLAPD_APPROX_OLDSINGLESTRING
+
+#if defined(SLAPD_APPROX_INITIALS)
+#define SLAPD_APPROX_DELIMITER "._ "
+#define SLAPD_APPROX_WORDLEN 2
+#else
+#define SLAPD_APPROX_DELIMITER " "
+#define SLAPD_APPROX_WORDLEN 1
+#endif
+
static int
-caseExactSubstringsMatch(
+approxMatch(
int *matchp,
slap_mask_t flags,
Syntax *syntax,
struct berval *value,
void *assertedValue )
{
- int match = 0;
- SubstringsAssertion *sub = assertedValue;
- struct berval left = *value;
- int i;
- ber_len_t inlen=0;
+ char *val, *assertv, **values, **words, *c;
+ int i, count, len, nextchunk=0, nextavail=0;
+ size_t avlen;
+
+ /* Yes, this is necessary */
+ val = UTF8normalize( value->bv_val, UTF8_NOCASEFOLD );
+ if( val == NULL ) {
+ *matchp = 1;
+ return LDAP_SUCCESS;
+ }
+ strip8bitChars( val );
- /* Add up asserted input length */
- if( sub->sa_initial ) {
- inlen += sub->sa_initial->bv_len;
+ /* Yes, this is necessary */
+ assertv = UTF8normalize( ((struct berval *)assertedValue)->bv_val,
+ UTF8_NOCASEFOLD );
+ if( assertv == NULL ) {
+ free( val );
+ *matchp = 1;
+ return LDAP_SUCCESS;
}
- if( sub->sa_any ) {
- for(i=0; sub->sa_any[i] != NULL; i++) {
- inlen += sub->sa_any[i]->bv_len;
- }
+ strip8bitChars( assertv );
+ avlen = strlen( assertv );
+
+ /* Isolate how many words there are */
+ for( c=val,count=1; *c; c++ ) {
+ c = strpbrk( c, SLAPD_APPROX_DELIMITER );
+ if ( c == NULL ) break;
+ *c = '\0';
+ count++;
}
- if( sub->sa_final ) {
- inlen += sub->sa_final->bv_len;
+
+ /* Get a phonetic copy of each word */
+ words = (char **)ch_malloc( count * sizeof(char *) );
+ values = (char **)ch_malloc( count * sizeof(char *) );
+ for( c=val,i=0; i<count; i++,c+=strlen(c)+1 ) {
+ words[i] = c;
+ values[i] = phonetic(c);
}
- if( sub->sa_initial ) {
- if( inlen > left.bv_len ) {
- match = 1;
- goto done;
+ /* Work through the asserted value's words, to see if at least some
+ of the words are there, in the same order. */
+ len = 0;
+ while ( nextchunk < avlen ) {
+ len = strcspn( assertv + nextchunk, SLAPD_APPROX_DELIMITER);
+ if( len == 0 ) {
+ nextchunk++;
+ continue;
+ }
+#if defined(SLAPD_APPROX_INITIALS)
+ else if( len == 1 ) {
+ /* Single letter words need to at least match one word's initial */
+ for( i=nextavail; i<count; i++ )
+ if( !strncasecmp( assertv+nextchunk, words[i], 1 )) {
+ nextavail=i+1;
+ break;
+ }
+ }
+#endif
+ else {
+ /* Isolate the next word in the asserted value and phonetic it */
+ assertv[nextchunk+len] = '\0';
+ val = phonetic( assertv + nextchunk );
+
+ /* See if this phonetic chunk is in the remaining words of *value */
+ for( i=nextavail; i<count; i++ ){
+ if( !strcmp( val, values[i] ) ){
+ nextavail = i+1;
+ break;
+ }
+ }
}
- match = strncmp( sub->sa_initial->bv_val, left.bv_val,
- sub->sa_initial->bv_len );
-
- if( match != 0 ) {
- goto done;
+ /* This chunk in the asserted value was NOT within the *value. */
+ if( i >= count ) {
+ nextavail=-1;
+ break;
}
- left.bv_val += sub->sa_initial->bv_len;
- left.bv_len -= sub->sa_initial->bv_len;
- inlen -= sub->sa_initial->bv_len;
+ /* Go on to the next word in the asserted value */
+ nextchunk += len+1;
}
- if( sub->sa_final ) {
- if( inlen > left.bv_len ) {
- match = 1;
- goto done;
- }
+ /* If some of the words were seen, call it a match */
+ if( nextavail > 0 ) {
+ *matchp = 0;
+ }
+ else {
+ *matchp = 1;
+ }
- match = strncmp( sub->sa_final->bv_val,
- &left.bv_val[left.bv_len - sub->sa_final->bv_len],
- sub->sa_final->bv_len );
+ /* Cleanup allocs */
+ free( assertv );
+ for( i=0; i<count; i++ ) {
+ ch_free( values[i] );
+ }
+ ch_free( values );
+ ch_free( words );
+ free( val );
- if( match != 0 ) {
- goto done;
+ return LDAP_SUCCESS;
+}
+
+int
+approxIndexer(
+ slap_mask_t use,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *prefix,
+ struct berval **values,
+ struct berval ***keysp )
+{
+ char *val, *c;
+ int i,j, len, wordcount, keycount=0;
+ struct berval **newkeys, **keys=NULL;
+
+ for( j=0; values[j] != NULL; j++ ) {
+ /* Yes, this is necessary */
+ val = UTF8normalize( values[j]->bv_val, UTF8_NOCASEFOLD );
+ strip8bitChars( val );
+
+ /* Isolate how many words there are. There will be a key for each */
+ for( wordcount=0,c=val; *c; c++) {
+ len = strcspn(c, SLAPD_APPROX_DELIMITER);
+ if( len >= SLAPD_APPROX_WORDLEN ) wordcount++;
+ c+= len;
+ if (*c == '\0') break;
+ *c = '\0';
}
- left.bv_len -= sub->sa_final->bv_len;
- inlen -= sub->sa_final->bv_len;
+ /* Allocate/increase storage to account for new keys */
+ newkeys = (struct berval **)ch_malloc( (keycount + wordcount + 1)
+ * sizeof(struct berval *) );
+ memcpy( newkeys, keys, keycount * sizeof(struct berval *) );
+ if( keys ) ch_free( keys );
+ keys = newkeys;
+
+ /* Get a phonetic copy of each word */
+ for( c=val,i=0; i<wordcount; c+=len+1 ) {
+ len = strlen( c );
+ if( len < SLAPD_APPROX_WORDLEN ) continue;
+ keys[keycount] = (struct berval *)ch_malloc( sizeof(struct berval) );
+ keys[keycount]->bv_val = phonetic( c );
+ keys[keycount]->bv_len = strlen( keys[keycount]->bv_val );
+ keycount++;
+ i++;
+ }
+
+ free( val );
}
+ keys[keycount] = NULL;
+ *keysp = keys;
- if( sub->sa_any ) {
- for(i=0; sub->sa_any[i]; i++) {
- ber_len_t idx;
- char *p;
+ return LDAP_SUCCESS;
+}
-retry:
- if( inlen > left.bv_len ) {
- /* not enough length */
- match = 1;
- goto done;
- }
-
- if( sub->sa_any[i]->bv_len == 0 ) {
- continue;
- }
-
- p = strchr( left.bv_val, *sub->sa_any[i]->bv_val );
-
- if( p == NULL ) {
- match = 1;
- goto done;
- }
-
- idx = p - left.bv_val;
- assert( idx < left.bv_len );
-
- if( idx >= left.bv_len ) {
- /* this shouldn't happen */
- return LDAP_OTHER;
- }
-
- left.bv_val = p;
- left.bv_len -= idx;
-
- if( sub->sa_any[i]->bv_len > left.bv_len ) {
- /* not enough left */
- match = 1;
- goto done;
- }
-
- match = strncmp( left.bv_val,
- sub->sa_any[i]->bv_val,
- sub->sa_any[i]->bv_len );
-
- if( match != 0 ) {
- left.bv_val++;
- left.bv_len--;
- goto retry;
- }
-
- left.bv_val += sub->sa_any[i]->bv_len;
- left.bv_len -= sub->sa_any[i]->bv_len;
- inlen -= sub->sa_any[i]->bv_len;
- }
- }
-
-done:
- *matchp = match;
- return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-int caseExactIndexer(
+int
+approxFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- struct berval **values,
+ void * assertValue,
struct berval ***keysp )
{
- int i;
- size_t slen, mlen;
+ char *val, *c;
+ int i, count, len;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
- struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
- for( i=0; values[i] != NULL; i++ ) {
- /* just count them */
+ /* Yes, this is necessary */
+ val = UTF8normalize( ((struct berval *)assertValue)->bv_val,
+ UTF8_NOCASEFOLD );
+ if( val == NULL ) {
+ keys = (struct berval **)ch_malloc( sizeof(struct berval *) );
+ keys[0] = NULL;
+ *keysp = keys;
+ return LDAP_SUCCESS;
}
+ strip8bitChars( val );
- assert( i > 0 );
-
- keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- for( i=0; values[i] != NULL; i++ ) {
- struct berval *value = values[i];
-
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
- }
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
-
- keys[i] = ber_bvdup( &digest );
+ /* Isolate how many words there are. There will be a key for each */
+ for( count=0,c=val; *c; c++) {
+ len = strcspn(c, SLAPD_APPROX_DELIMITER);
+ if( len >= SLAPD_APPROX_WORDLEN ) count++;
+ c+= len;
+ if (*c == '\0') break;
+ *c = '\0';
}
- keys[i] = NULL;
- *keysp = keys;
- return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-int caseExactFilter(
- slap_mask_t use,
- slap_mask_t flags,
- Syntax *syntax,
- MatchingRule *mr,
- struct berval *prefix,
- void * assertValue,
- struct berval ***keysp )
-{
- size_t slen, mlen;
- struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
- struct berval *value;
- struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- value = (struct berval *) assertValue;
-
- keys = ch_malloc( sizeof( struct berval * ) * 2 );
+ /* Allocate storage for new keys */
+ keys = (struct berval **)ch_malloc( (count + 1) * sizeof(struct berval *) );
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
+ /* Get a phonetic copy of each word */
+ for( c=val,i=0; i<count; c+=len+1 ) {
+ len = strlen(c);
+ if( len < SLAPD_APPROX_WORDLEN ) continue;
+ keys[i] = ber_bvstr( phonetic( c ) );
+ i++;
}
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
- keys[0] = ber_bvdup( &digest );
- keys[1] = NULL;
+ free( val );
+ keys[count] = NULL;
*keysp = keys;
+
return LDAP_SUCCESS;
}
-/* Substrings Index generation function */
-int caseExactSubstringsIndexer(
- slap_mask_t use,
+
+#else
+/* No other form of Approximate Matching is defined */
+
+static int
+approxMatch(
+ int *matchp,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
- struct berval *prefix,
- struct berval **values,
- struct berval ***keysp )
+ struct berval *value,
+ void *assertedValue )
{
- ber_len_t i, nkeys;
- size_t slen, mlen;
- struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
- struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
-
- nkeys=0;
- for( i=0; values[i] != NULL; i++ ) {
- /* count number of indices to generate */
- if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
- continue;
- }
+ char *vapprox, *avapprox;
+ char *s, *t;
- if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
- if( values[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- nkeys += SLAP_INDEX_SUBSTR_MAXLEN -
- ( SLAP_INDEX_SUBSTR_MINLEN - 1);
- } else {
- nkeys += values[i]->bv_len - ( SLAP_INDEX_SUBSTR_MINLEN - 1 );
- }
- }
-
- if( flags & SLAP_INDEX_SUBSTR_ANY ) {
- if( values[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- nkeys += values[i]->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1 );
- }
- }
-
- if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
- if( values[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- nkeys += SLAP_INDEX_SUBSTR_MAXLEN -
- ( SLAP_INDEX_SUBSTR_MINLEN - 1);
- } else {
- nkeys += values[i]->bv_len - ( SLAP_INDEX_SUBSTR_MINLEN - 1 );
- }
- }
+ /* Yes, this is necessary */
+ s = UTF8normalize( value->bv_val, UTF8_NOCASEFOLD );
+ if( s == NULL ) {
+ *matchp = 1;
+ return LDAP_SUCCESS;
}
- assert( i > 0 );
- if( nkeys == 0 ) {
- /* no keys to generate */
- *keysp = NULL;
+ /* Yes, this is necessary */
+ t = UTF8normalize( ((struct berval *)assertedValue)->bv_val,
+ UTF8_NOCASEFOLD );
+ if( t == NULL ) {
+ free( s );
+ *matchp = -1;
return LDAP_SUCCESS;
}
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- nkeys=0;
- for( i=0; values[i] != NULL; i++ ) {
- ber_len_t j,max;
- struct berval *value;
-
- value = values[i];
- if( value->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
-
- if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
- ( value->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
- {
- char pre = SLAP_INDEX_SUBSTR_PREFIX;
- max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
-
- for( j=0; j<max; j++ ) {
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
- }
+ vapprox = phonetic( strip8bitChars( s ) );
+ avapprox = phonetic( strip8bitChars( t ) );
- lutil_MD5Update( &MD5context,
- &pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- &value->bv_val[j],
- SLAP_INDEX_SUBSTR_MAXLEN );
- lutil_MD5Final( MD5digest, &MD5context );
+ free( s );
+ free( t );
- keys[nkeys++] = ber_bvdup( &digest );
- }
- }
+ *matchp = strcmp( vapprox, avapprox );
- max = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
-
- for( j=SLAP_INDEX_SUBSTR_MINLEN; j<=max; j++ ) {
- char pre;
-
- if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
- pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
- }
- lutil_MD5Update( &MD5context,
- &pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- value->bv_val, j );
- lutil_MD5Final( MD5digest, &MD5context );
-
- keys[nkeys++] = ber_bvdup( &digest );
- }
-
- if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
- pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
- }
- lutil_MD5Update( &MD5context,
- &pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- &value->bv_val[value->bv_len-j], j );
- lutil_MD5Final( MD5digest, &MD5context );
-
- keys[nkeys++] = ber_bvdup( &digest );
- }
-
- }
- }
-
- if( nkeys > 0 ) {
- keys[nkeys] = NULL;
- *keysp = keys;
- } else {
- ch_free( keys );
- *keysp = NULL;
- }
+ ch_free( vapprox );
+ ch_free( avapprox );
return LDAP_SUCCESS;
}
-int caseExactSubstringsFilter(
+int
+approxIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- void * assertValue,
+ struct berval **values,
struct berval ***keysp )
{
- SubstringsAssertion *sa = assertValue;
- char pre;
- ber_len_t nkeys = 0;
- size_t slen, mlen, klen;
+ int i;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
- struct berval *value;
- struct berval digest;
-
- if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- nkeys++;
- }
-
- if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
- ber_len_t i;
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
- /* don't bother accounting for stepping */
- nkeys += sa->sa_any[i]->bv_len -
- ( SLAP_INDEX_SUBSTR_MAXLEN - 1 );
- }
- }
- }
-
- if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- nkeys++;
- }
-
- if( nkeys == 0 ) {
- *keysp = NULL;
- return LDAP_SUCCESS;
- }
-
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
-
- slen = strlen( syntax->ssyn_oid );
- mlen = strlen( mr->smr_oid );
-
- keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
- nkeys = 0;
+ char *s;
- if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
- sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- value = sa->sa_initial;
-
- klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
-
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
- }
- lutil_MD5Update( &MD5context,
- &pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- value->bv_val, klen );
- lutil_MD5Final( MD5digest, &MD5context );
-
- keys[nkeys++] = ber_bvdup( &digest );
+ for( i=0; values[i] != NULL; i++ ) {
+ /* empty - just count them */
}
- if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
- ber_len_t i, j;
- pre = SLAP_INDEX_SUBSTR_PREFIX;
- klen = SLAP_INDEX_SUBSTR_MAXLEN;
-
- for( i=0; sa->sa_any[i] != NULL; i++ ) {
- if( sa->sa_any[i]->bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
- continue;
- }
+ /* we should have at least one value at this point */
+ assert( i > 0 );
- value = sa->sa_any[i];
+ keys = (struct berval **)ch_malloc( sizeof( struct berval * ) * (i+1) );
- for(j=0;
- j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
- j += SLAP_INDEX_SUBSTR_STEP )
- {
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
- }
- lutil_MD5Update( &MD5context,
- &pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- &value->bv_val[j], klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ /* Copy each value and run it through phonetic() */
+ for( i=0; values[i] != NULL; i++ ) {
+ /* Yes, this is necessary */
+ s = UTF8normalize( values[i]->bv_val, UTF8_NOCASEFOLD );
- keys[nkeys++] = ber_bvdup( &digest );
- }
- }
+ /* strip 8-bit chars and run through phonetic() */
+ keys[i] = ber_bvstr( phonetic( strip8bitChars( s ) ) );
+ free( s );
}
+ keys[i] = NULL;
- if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
- sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
- {
- pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- value = sa->sa_final;
-
- klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
- ? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
+ *keysp = keys;
+ return LDAP_SUCCESS;
+}
- lutil_MD5Init( &MD5context );
- if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
- prefix->bv_val, prefix->bv_len );
- }
- lutil_MD5Update( &MD5context,
- &pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
- syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
- mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- &value->bv_val[value->bv_len-klen], klen );
- lutil_MD5Final( MD5digest, &MD5context );
- keys[nkeys++] = ber_bvdup( &digest );
- }
+int
+approxFilter(
+ slap_mask_t use,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *prefix,
+ void * assertValue,
+ struct berval ***keysp )
+{
+ struct berval **keys;
+ char *s;
- if( nkeys > 0 ) {
- keys[nkeys] = NULL;
- *keysp = keys;
+ keys = (struct berval **)ch_malloc( sizeof( struct berval * ) * 2 );
+
+ /* Yes, this is necessary */
+ s = UTF8normalize( ((struct berval *)assertValue)->bv_val,
+ UTF8_NOCASEFOLD );
+ if( s == NULL ) {
+ keys[0] = NULL;
} else {
- ch_free( keys );
- *keysp = NULL;
+ /* strip 8-bit chars and run through phonetic() */
+ keys[0] = ber_bvstr( phonetic( strip8bitChars( s ) ) );
+ free( s );
+ keys[1] = NULL;
}
+ *keysp = keys;
return LDAP_SUCCESS;
}
-
+#endif
+
+
static int
-caseIgnoreMatch(
+caseExactMatch(
int *matchp,
slap_mask_t flags,
Syntax *syntax,
struct berval *value,
void *assertedValue )
{
-#if 0
- *matchp = UTF8casecmp( value, (struct berval *) assertedValue );
-#else
- int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
-
- if( match == 0 ) {
- match = strncasecmp( value->bv_val,
- ((struct berval *) assertedValue)->bv_val,
- value->bv_len );
- }
-
- *matchp = match;
-#endif
+ *matchp = UTF8normcmp( value->bv_val,
+ ((struct berval *) assertedValue)->bv_val,
+ UTF8_NOCASEFOLD );
return LDAP_SUCCESS;
}
static int
-caseIgnoreSubstringsMatch(
+caseExactIgnoreSubstringsMatch(
int *matchp,
slap_mask_t flags,
Syntax *syntax,
void *assertedValue )
{
int match = 0;
- SubstringsAssertion *sub = assertedValue;
- struct berval left = *value;
+ SubstringsAssertion *sub;
+ struct berval left;
int i;
ber_len_t inlen=0;
+ char *nav, casefold;
+
+ casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
+ nav = UTF8normalize( value->bv_val, casefold );
+ if( nav == NULL ) {
+ match = 1;
+ goto done;
+ }
+ left.bv_val = nav;
+ left.bv_len = strlen( nav );
+
+ sub = UTF8SubstringsassertionNormalize( assertedValue, casefold );
+ if( sub == NULL ) {
+ match = -1;
+ goto done;
+ }
/* Add up asserted input length */
if( sub->sa_initial ) {
goto done;
}
- match = strncasecmp( sub->sa_initial->bv_val, left.bv_val,
+ match = strncmp( sub->sa_initial->bv_val, left.bv_val,
sub->sa_initial->bv_len );
if( match != 0 ) {
goto done;
}
- match = strncasecmp( sub->sa_final->bv_val,
+ match = strncmp( sub->sa_final->bv_val,
&left.bv_val[left.bv_len - sub->sa_final->bv_len],
sub->sa_final->bv_len );
continue;
}
- p = strcasechr( left.bv_val, *sub->sa_any[i]->bv_val );
+ p = strchr( left.bv_val, *sub->sa_any[i]->bv_val );
if( p == NULL ) {
match = 1;
goto done;
}
- match = strncasecmp( left.bv_val,
+ match = strncmp( left.bv_val,
sub->sa_any[i]->bv_val,
sub->sa_any[i]->bv_len );
if( match != 0 ) {
left.bv_val++;
left.bv_len--;
-
goto retry;
}
}
done:
+ free( nav );
+ if( sub != NULL ) {
+ ch_free( sub->sa_final );
+ ber_bvecfree( sub->sa_any );
+ ch_free( sub->sa_initial );
+ ch_free( sub );
+ }
*matchp = match;
return LDAP_SUCCESS;
}
/* Index generation function */
-int caseIgnoreIndexer(
+int caseExactIgnoreIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
struct berval ***keysp )
{
int i;
+ char casefold;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
for( i=0; values[i] != NULL; i++ ) {
- /* just count them */
+ /* empty - just count them */
}
+ /* we should have at least one value at this point */
assert( i > 0 );
keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
+ casefold = strcmp( mr->smr_oid, caseExactMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
for( i=0; values[i] != NULL; i++ ) {
- struct berval *value = ber_bvdup( values[i] );
- ldap_pvt_str2upper( value->bv_val );
+ struct berval *value;
+ value = ber_bvstr( UTF8normalize( values[i]->bv_val,
+ casefold ) );
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
ber_bvfree( value );
}
/* Index generation function */
-int caseIgnoreFilter(
+int caseExactIgnoreFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
void * assertValue,
struct berval ***keysp )
{
+ char casefold;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
- value = ber_bvdup( (struct berval *) assertValue );
- ldap_pvt_str2upper( value->bv_val );
+ casefold = strcmp( mr->smr_oid, caseExactMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
+ value = ber_bvstr( UTF8normalize( ((struct berval *) assertValue)->bv_val,
+ casefold ) );
+ /* This usually happens if filter contains bad UTF8 */
+ if( value == NULL ) {
+ keys = ch_malloc( sizeof( struct berval * ) );
+ keys[0] = NULL;
+ return LDAP_SUCCESS;
+ }
keys = ch_malloc( sizeof( struct berval * ) * 2 );
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[0] = ber_bvdup( &digest );
keys[1] = NULL;
ber_bvfree( value );
*keysp = keys;
-
return LDAP_SUCCESS;
}
/* Substrings Index generation function */
-int caseIgnoreSubstringsIndexer(
+int caseExactIgnoreSubstringsIndexer(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
struct berval **values,
struct berval ***keysp )
{
+ char casefold;
ber_len_t i, nkeys;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
+ struct berval **nvalues;
+
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
nkeys=0;
+
+ for( i=0; values[i] != NULL; i++ ) {
+ /* empty - just count them */
+ }
+
+ /* we should have at least one value at this point */
+ assert( i > 0 );
+
+ casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
+ nvalues = ch_malloc( sizeof( struct berval * ) * (i+1) );
+ for( i=0; values[i] != NULL; i++ ) {
+ nvalues[i] = ber_bvstr( UTF8normalize( values[i]->bv_val,
+ casefold ) );
+ }
+ nvalues[i] = NULL;
+ values = nvalues;
+
for( i=0; values[i] != NULL; i++ ) {
/* count number of indices to generate */
if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
}
}
}
- assert( i > 0 );
if( nkeys == 0 ) {
/* no keys to generate */
nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
- int j,max;
+ ber_len_t j,max;
struct berval *value;
if( values[i]->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
- value = ber_bvdup( values[i] );
- ldap_pvt_str2upper( value->bv_val );
+ value = values[i];
if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
( value->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
for( j=0; j<max; j++ ) {
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[j],
SLAP_INDEX_SUBSTR_MAXLEN );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, j );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[value->bv_len-j], j );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
}
- ber_bvfree( value );
}
if( nkeys > 0 ) {
*keysp = NULL;
}
+ ber_bvecfree( nvalues );
+
return LDAP_SUCCESS;
}
-int caseIgnoreSubstringsFilter(
+int caseExactIgnoreSubstringsFilter(
slap_mask_t use,
slap_mask_t flags,
Syntax *syntax,
void * assertValue,
struct berval ***keysp )
{
- SubstringsAssertion *sa = assertValue;
- char pre;
+ SubstringsAssertion *sa;
+ char pre, casefold;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
+ casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ ? UTF8_CASEFOLD : UTF8_NOCASEFOLD;
+
+ sa = UTF8SubstringsassertionNormalize( assertValue, casefold );
+ if( sa == NULL ) {
+ *keysp = NULL;
+ return LDAP_SUCCESS;
+ }
+
+ if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
}
- if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
+ if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
ber_len_t i;
for( i=0; sa->sa_any[i] != NULL; i++ ) {
if( sa->sa_any[i]->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) {
}
}
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
+ if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
nkeys++;
return LDAP_SUCCESS;
}
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
keys = ch_malloc( sizeof( struct berval * ) * (nkeys+1) );
nkeys = 0;
- if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial != NULL &&
+ if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial != NULL &&
sa->sa_initial->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- value = ber_bvdup( sa->sa_initial );
- ldap_pvt_str2upper( value->bv_val );
+ value = sa->sa_initial;
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
- ber_bvfree( value );
keys[nkeys++] = ber_bvdup( &digest );
}
- if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
+ if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
ber_len_t i, j;
pre = SLAP_INDEX_SUBSTR_PREFIX;
klen = SLAP_INDEX_SUBSTR_MAXLEN;
continue;
}
- value = ber_bvdup( sa->sa_any[i] );
- ldap_pvt_str2upper( value->bv_val );
+ value = sa->sa_any[i];
for(j=0;
j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
j += SLAP_INDEX_SUBSTR_STEP )
{
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
- &value->bv_val[j], klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Update( &HASHcontext,
+ &value->bv_val[j], klen );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
- ber_bvfree( value );
}
}
- if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final != NULL &&
+ if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final != NULL &&
sa->sa_final->bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
{
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- value = ber_bvdup( sa->sa_final );
- ldap_pvt_str2upper( value->bv_val );
+ value = sa->sa_final;
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[value->bv_len-klen], klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
- ber_bvfree( value );
keys[nkeys++] = ber_bvdup( &digest );
}
- if( nkeys > 0 ) {
- keys[nkeys] = NULL;
- *keysp = keys;
- } else {
- ch_free( keys );
- *keysp = NULL;
+ if( nkeys > 0 ) {
+ keys[nkeys] = NULL;
+ *keysp = keys;
+ } else {
+ ch_free( keys );
+ *keysp = NULL;
+ }
+ ch_free( sa->sa_final );
+ ber_bvecfree( sa->sa_any );
+ ch_free( sa->sa_initial );
+ ch_free( sa );
+
+ return LDAP_SUCCESS;
+}
+
+static int
+caseIgnoreMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ *matchp = UTF8normcmp( value->bv_val,
+ ((struct berval *) assertedValue)->bv_val,
+ UTF8_CASEFOLD );
+ return LDAP_SUCCESS;
+}
+
+static int
+oidValidate(
+ Syntax *syntax,
+ struct berval *val )
+{
+ ber_len_t i;
+
+ if( val->bv_len == 0 ) {
+ /* disallow empty strings */
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ if( OID_LEADCHAR(val->bv_val[0]) ) {
+ int dot = 0;
+ for(i=1; i < val->bv_len; i++) {
+ if( OID_SEPARATOR( val->bv_val[i] ) ) {
+ if( dot++ ) return 1;
+ } else if ( OID_CHAR( val->bv_val[i] ) ) {
+ dot = 0;
+ } else {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ return !dot ? LDAP_SUCCESS : LDAP_INVALID_SYNTAX;
+
+ } else if( DESC_LEADCHAR(val->bv_val[0]) ) {
+ for(i=1; i < val->bv_len; i++) {
+ if( !DESC_CHAR(val->bv_val[i] ) ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ return LDAP_SUCCESS;
+ }
+
+ return LDAP_INVALID_SYNTAX;
+}
+
+static int
+integerMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ char *v, *av;
+ int vsign=0, avsign=0;
+ struct berval *asserted;
+ ber_len_t vlen, avlen;
+
+
+ /* Start off pessimistic */
+ *matchp = 1;
+
+ /* Skip past leading spaces/zeros, and get the sign of the *value number */
+ v = value->bv_val;
+ vlen = value->bv_len;
+ while( vlen ) {
+ if( ASCII_SPACE(*v) || ( *v == '0' )) {
+ /* empty -- skip spaces */
+ }
+ else if ( *v == '+' ) {
+ vsign = 1;
+ }
+ else if ( *v == '-' ) {
+ vsign = -1;
+ }
+ else if ( ASCII_DIGIT(*v) ) {
+ if ( vsign == 0 ) vsign = 1;
+ vsign *= 2;
+ break;
+ }
+ v++;
+ vlen--;
+ }
+
+ /* Skip past leading spaces/zeros, and get the sign of the *assertedValue
+ number */
+ asserted = (struct berval *) assertedValue;
+ av = asserted->bv_val;
+ avlen = asserted->bv_len;
+ while( avlen ) {
+ if( ASCII_SPACE(*av) || ( *av == '0' )) {
+ /* empty -- skip spaces */
+ }
+ else if ( *av == '+' ) {
+ avsign = 1;
+ }
+ else if ( *av == '-' ) {
+ avsign = -1;
+ }
+ else if ( ASCII_DIGIT(*av) ) {
+ if ( avsign == 0 ) avsign = 1;
+ avsign *= 2;
+ break;
+ }
+ av++;
+ avlen--;
+ }
+
+ /* The two ?sign vars are now one of :
+ -2 negative non-zero number
+ -1 -0 \
+ 0 0 collapse these three to 0
+ +1 +0 /
+ +2 positive non-zero number
+ */
+ if ( abs( vsign ) == 1 ) vsign = 0;
+ if ( abs( avsign ) == 1 ) avsign = 0;
+
+ if( vsign != avsign ) return LDAP_SUCCESS;
+
+ /* Check the significant digits */
+ while( vlen && avlen ) {
+ if( *v != *av ) break;
+ v++;
+ vlen--;
+ av++;
+ avlen--;
+ }
+
+ /* If all digits compared equal, the numbers are equal */
+ if(( vlen == 0 ) && ( avlen == 0 )) {
+ *matchp = 0;
+ }
+ return LDAP_SUCCESS;
+}
+
+static int
+integerValidate(
+ Syntax *syntax,
+ struct berval *val )
+{
+ ber_len_t i;
+
+ if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
+
+ 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;
+ }
+
+ for( i=1; i < val->bv_len; i++ ) {
+ if( !ASCII_DIGIT(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
+ }
+
+ return LDAP_SUCCESS;
+}
+
+static int
+integerNormalize(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval **normalized )
+{
+ char *p;
+ int negative=0;
+ struct berval *newval;
+ ber_len_t len;
+
+
+ p = val->bv_val;
+ len = val->bv_len;
+
+ /* Ignore leading spaces */
+ while ( len && ( *p == ' ' )) {
+ p++;
+ len--;
+ }
+
+ /* save sign */
+ if( len ) {
+ negative = ( *p == '-' );
+ if(( *p == '-' ) || ( *p == '+' )) {
+ p++;
+ len--;
+ }
+ }
+
+ /* Ignore leading zeros */
+ while ( len && ( *p == '0' )) {
+ p++;
+ len--;
+ }
+
+ newval = (struct berval *) ch_malloc( sizeof(struct berval) );
+
+ /* If there are no non-zero digits left, the number is zero, otherwise
+ allocate space for the number and copy it into the buffer */
+ if( len == 0 ) {
+ newval->bv_val = ch_strdup("0");
+ newval->bv_len = 1;
+ }
+ else {
+ newval->bv_len = len+negative;
+ newval->bv_val = ch_malloc( newval->bv_len );
+ if( negative ) {
+ newval->bv_val[0] = '-';
+ }
+ memcpy( newval->bv_val + negative, p, len );
}
+ *normalized = newval;
return LDAP_SUCCESS;
}
-
-static int
-oidValidate(
+
+/* Index generation function */
+int integerIndexer(
+ slap_mask_t use,
+ slap_mask_t flags,
Syntax *syntax,
- struct berval *val )
+ MatchingRule *mr,
+ struct berval *prefix,
+ struct berval **values,
+ struct berval ***keysp )
{
- ber_len_t i;
-
- if( val->bv_len == 0 ) return 0;
+ int i;
+ struct berval **keys;
- if( OID_LEADCHAR(val->bv_val[0]) ) {
- int dot = 0;
- for(i=1; i < val->bv_len; i++) {
- if( OID_SEPARATOR( val->bv_val[i] ) ) {
- if( dot++ ) return 1;
- } else if ( OID_CHAR( val->bv_val[i] ) ) {
- dot = 0;
- } else {
- return LDAP_INVALID_SYNTAX;
- }
- }
+ /* we should have at least one value at this point */
+ assert( values != NULL && values[0] != NULL );
- return !dot ? LDAP_SUCCESS : LDAP_INVALID_SYNTAX;
+ for( i=0; values[i] != NULL; i++ ) {
+ /* empty -- just count them */
+ }
- } else if( DESC_LEADCHAR(val->bv_val[0]) ) {
- for(i=1; i < val->bv_len; i++) {
- if( !DESC_CHAR(val->bv_val[i] ) ) {
- return LDAP_INVALID_SYNTAX;
- }
- }
+ keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
- return LDAP_SUCCESS;
+ for( i=0; values[i] != NULL; i++ ) {
+ integerNormalize( syntax, values[i], &keys[i] );
}
-
- return LDAP_INVALID_SYNTAX;
+
+ keys[i] = NULL;
+ *keysp = keys;
+ return LDAP_SUCCESS;
+}
+
+/* Index generation function */
+int integerFilter(
+ slap_mask_t use,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *prefix,
+ void * assertValue,
+ struct berval ***keysp )
+{
+ struct berval **keys;
+
+ keys = ch_malloc( sizeof( struct berval * ) * 2 );
+ integerNormalize( syntax, assertValue, &keys[0] );
+ keys[1] = NULL;
+ *keysp = keys;
+
+ return LDAP_SUCCESS;
}
+
static int
-integerValidate(
+countryStringValidate(
Syntax *syntax,
struct berval *val )
{
- ber_len_t i;
-
- if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
+ if( val->bv_len != 2 ) return LDAP_INVALID_SYNTAX;
- for(i=0; i < val->bv_len; i++) {
- if( !ASCII_DIGIT(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
+ if( !SLAP_PRINTABLE(val->bv_val[0]) ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ if( !SLAP_PRINTABLE(val->bv_val[1]) ) {
+ return LDAP_INVALID_SYNTAX;
}
return LDAP_SUCCESS;
if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
for(i=0; i < val->bv_len; i++) {
- if( !isprint(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
+ if( !SLAP_PRINTABLE(val->bv_val[i]) ) {
+ return LDAP_INVALID_SYNTAX;
+ }
}
return LDAP_SUCCESS;
}
static int
-IA5StringValidate(
+printablesStringValidate(
Syntax *syntax,
struct berval *val )
{
if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
for(i=0; i < val->bv_len; i++) {
- if( !isascii(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
+ if( !SLAP_PRINTABLES(val->bv_val[i]) ) {
+ return LDAP_INVALID_SYNTAX;
+ }
}
return LDAP_SUCCESS;
}
static int
-IA5StringConvert(
+IA5StringValidate(
Syntax *syntax,
- struct berval *in,
- struct berval **out )
+ struct berval *val )
{
- ldap_unicode_t *u;
- ber_len_t i, len = in->bv_len;
- struct berval *bv = ch_malloc( sizeof(struct berval) );
+ ber_len_t i;
- bv->bv_len = len * sizeof( ldap_unicode_t );
- u = (ldap_unicode_t *) ch_malloc( bv->bv_len + sizeof(ldap_unicode_t) );
- bv->bv_val = (char *) u;
+ if( !val->bv_len ) return LDAP_INVALID_SYNTAX;
- for(i=0; i < len; i++ ) {
- /*
- * IA5StringValidate should have been called to ensure
- * input is limited to IA5.
- */
- u[i] = in->bv_val[i];
+ for(i=0; i < val->bv_len; i++) {
+ if( !isascii(val->bv_val[i]) ) return LDAP_INVALID_SYNTAX;
}
- u[i] = 0;
- *out = bv;
return LDAP_SUCCESS;
}
assert( *newval->bv_val );
assert( newval->bv_val < p );
- assert( p <= q );
+ assert( q <= p );
/* cannot start with a space */
assert( !ASCII_SPACE(*newval->bv_val) );
int i;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
for( i=0; values[i] != NULL; i++ ) {
- /* just count them */
+ /* empty - just count them */
}
+ /* we should have at least one value at this point */
assert( i > 0 );
keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
for( i=0; values[i] != NULL; i++ ) {
struct berval *value = values[i];
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[i] = ber_bvdup( &digest );
}
{
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
keys = ch_malloc( sizeof( struct berval * ) * 2 );
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[0] = ber_bvdup( &digest );
keys[1] = NULL;
ber_len_t i, nkeys;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
+
+ /* we should have at least one value at this point */
+ assert( values != NULL && values[0] != NULL );
nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
}
}
}
- assert( i > 0 );
if( nkeys == 0 ) {
/* no keys to generate */
max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
for( j=0; j<max; j++ ) {
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[j],
SLAP_INDEX_SUBSTR_MAXLEN );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, j );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[value->bv_len-j], j );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
return LDAP_SUCCESS;
}
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
j += SLAP_INDEX_SUBSTR_STEP )
{
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[j], klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[value->bv_len-klen], klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
{
int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
- if( match == 0 ) {
+ if( match == 0 && value->bv_len ) {
match = strncasecmp( value->bv_val,
((struct berval *) assertedValue)->bv_val,
value->bv_len );
int i;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
+
+ /* we should have at least one value at this point */
+ assert( values != NULL && values[0] != NULL );
for( i=0; values[i] != NULL; i++ ) {
/* just count them */
}
- assert( i > 0 );
-
keys = ch_malloc( sizeof( struct berval * ) * (i+1) );
slen = strlen( syntax->ssyn_oid );
struct berval *value = ber_bvdup( values[i] );
ldap_pvt_str2upper( value->bv_val );
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
ber_bvfree( value );
{
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
keys = ch_malloc( sizeof( struct berval * ) * 2 );
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, value->bv_len );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[0] = ber_bvdup( &digest );
keys[1] = NULL;
ber_len_t i, nkeys;
size_t slen, mlen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[16];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
+
+ /* we should have at least one value at this point */
+ assert( values != NULL && values[0] != NULL );
nkeys=0;
for( i=0; values[i] != NULL; i++ ) {
}
}
}
- assert( i > 0 );
if( nkeys == 0 ) {
/* no keys to generate */
max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
for( j=0; j<max; j++ ) {
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[j],
SLAP_INDEX_SUBSTR_MAXLEN );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, j );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[value->bv_len-j], j );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
struct berval **keys;
- lutil_MD5_CTX MD5context;
- unsigned char MD5digest[LUTIL_MD5_BYTES];
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
return LDAP_SUCCESS;
}
- digest.bv_val = MD5digest;
- digest.bv_len = sizeof(MD5digest);
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
slen = strlen( syntax->ssyn_oid );
mlen = strlen( mr->smr_oid );
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
value->bv_val, klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
ber_bvfree( value );
keys[nkeys++] = ber_bvdup( &digest );
j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
j += SLAP_INDEX_SUBSTR_STEP )
{
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[j], klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
keys[nkeys++] = ber_bvdup( &digest );
}
klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
- lutil_MD5Init( &MD5context );
+ HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
prefix->bv_val, prefix->bv_len );
}
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&pre, sizeof( pre ) );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
syntax->ssyn_oid, slen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
mr->smr_oid, mlen );
- lutil_MD5Update( &MD5context,
+ HASH_Update( &HASHcontext,
&value->bv_val[value->bv_len-klen], klen );
- lutil_MD5Final( MD5digest, &MD5context );
+ HASH_Final( HASHdigest, &HASHcontext );
ber_bvfree( value );
keys[nkeys++] = ber_bvdup( &digest );
return LDAP_SUCCESS;
}
+static int
+numericStringValidate(
+ Syntax *syntax,
+ struct berval *in )
+{
+ ber_len_t i;
+
+ for(i=0; i < in->bv_len; i++) {
+ if( !SLAP_NUMERIC(in->bv_val[i]) ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ }
+
+ return LDAP_SUCCESS;
+}
+
static int
numericStringNormalize(
Syntax *syntax,
struct berval *val,
struct berval **normalized )
{
- /* similiar to IA5StringNormalize except removes all spaces */
+ /* removal all spaces */
struct berval *newval;
char *p, *q;
newval = ch_malloc( sizeof( struct berval ) );
+ newval->bv_val = ch_malloc( val->bv_len + 1 );
p = val->bv_val;
-
- /* Ignore initial whitespace */
- while ( ASCII_SPACE( *p ) ) {
- p++;
- }
-
- if( *p == '\0' ) {
- ch_free( newval );
- return LDAP_INVALID_SYNTAX;
- }
-
- newval->bv_val = ch_strdup( p );
- p = q = newval->bv_val;
+ q = newval->bv_val;
while ( *p ) {
if ( ASCII_SPACE( *p ) ) {
}
}
- assert( *newval->bv_val );
- assert( newval->bv_val < p );
- assert( q <= p );
-
- /* cannot start with a space */
- assert( !ASCII_SPACE(*newval->bv_val) );
-
- /* cannot end with a space */
- assert( !ASCII_SPACE( q[-1] ) );
+ /* we should have copied no more then is in val */
+ assert( (q - newval->bv_val) <= (p - val->bv_val) );
/* null terminate */
*q = '\0';
ch_free( stored );
}
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
+ "objectIdentifierFirstComponentMatch: %d\n %s\n %s\n",
+ match, value->bv_val, asserted->bv_val ));
+#else
Debug( LDAP_DEBUG_ARGS, "objectIdentifierFirstComponentMatch "
"%d\n\t\"%s\"\n\t\"%s\"\n",
- match, value->bv_val, asserted->bv_val );
+ match, value->bv_val, asserted->bv_val );
+#endif
+
if( rc == LDAP_SUCCESS ) *matchp = match;
return rc;
}
+static int
+integerBitAndMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ 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 )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
+ if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ *matchp = (lValue & lAssertedValue);
+ return LDAP_SUCCESS;
+}
+
+static int
+integerBitOrMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ 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 )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ lAssertedValue = strtol(((struct berval *)assertedValue)->bv_val, NULL, 10);
+ if(( lAssertedValue == LONG_MIN || lAssertedValue == LONG_MAX) && errno == ERANGE )
+ return LDAP_CONSTRAINT_VIOLATION;
+
+ *matchp = (lValue | lAssertedValue);
+ return LDAP_SUCCESS;
+}
+
+#ifdef HAVE_TLS
+#include <openssl/x509.h>
+#include <openssl/err.h>
+char digit[] = "0123456789";
+
+/*
+ * Next function returns a string representation of a ASN1_INTEGER.
+ * It works for unlimited lengths.
+ */
+
+static struct berval *
+asn1_integer2str(ASN1_INTEGER *a)
+{
+ char buf[256];
+ char *p;
+
+ /* We work backwards, make it fill from the end of buf */
+ p = buf + sizeof(buf) - 1;
+ *p = '\0';
+
+ if ( a == NULL || a->length == 0 ) {
+ *--p = '0';
+ } else {
+ int i;
+ int n = a->length;
+ int base = 0;
+ unsigned int *copy;
+
+ /* We want to preserve the original */
+ copy = ch_malloc(n*sizeof(unsigned int));
+ for (i = 0; i<n; i++) {
+ copy[i] = a->data[i];
+ }
+
+ /*
+ * base indicates the index of the most significant
+ * byte that might be nonzero. When it goes off the
+ * end, we now there is nothing left to do.
+ */
+ while (base < n) {
+ unsigned int carry;
+ unsigned int temp;
+
+ carry = 0;
+ for (i = base; i<n; i++ ) {
+ copy[i] += carry*256;
+ carry = copy[i] % 10;
+ copy[i] /= 10;
+ }
+ if (p <= buf+1) {
+ /*
+ * Way too large, we need to leave
+ * room for sign if negative
+ */
+ return NULL;
+ }
+ *--p = digit[carry];
+ if (copy[base] == 0)
+ base++;
+ }
+ free(copy);
+ }
+
+ if ( a->type == V_ASN1_NEG_INTEGER ) {
+ *--p = '-';
+ }
+
+ return ber_bvstrdup(p);
+}
+
+static struct berval *
+dn_openssl2ldap(X509_NAME *name)
+{
+ char issuer_dn[1024];
+ BIO *bio;
+
+ bio = BIO_new(BIO_s_mem());
+ if ( !bio ) {
+ fprintf(stderr, ERR_error_string(ERR_get_error(),NULL));
+ /* ERR_print_errors(bio_err); */
+ return NULL;
+ }
+ X509_NAME_print_ex(bio, name, 0, XN_FLAG_RFC2253);
+
+ BIO_gets(bio, issuer_dn, 1024);
+
+ BIO_free(bio);
+ return ber_bvstrdup(issuer_dn);
+}
+
+static int
+serial_and_issuer_parse(
+ struct berval *assertion,
+ struct berval **serial,
+ struct berval **issuer_dn
+)
+{
+ char *begin;
+ char *end;
+ char *p;
+ char *q;
+
+ 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;
+
+ /* p now points at the $ sign, now use begin and end to delimit the
+ serial number */
+ while (ASCII_SPACE(*begin++))
+ ;
+ end = p;
+ while (ASCII_SPACE(*end--))
+ ;
+
+ q = ch_malloc( (end-begin+1)+1 );
+ AC_MEMCPY( q, begin, end-begin+1 );
+ q[end-begin+1] = '\0';
+ *serial = ber_bvstr(q);
+
+ /* now extract the issuer, remember p was at the dollar sign */
+ begin = p+1;
+ end = assertion->bv_val+assertion->bv_len-1;
+ while (ASCII_SPACE(*begin++))
+ ;
+ /* should we trim spaces at the end too? is it safe always? */
+
+ q = ch_malloc( (end-begin+1)+1 );
+ AC_MEMCPY( q, begin, end-begin+1 );
+ q[end-begin+1] = '\0';
+ *issuer_dn = ber_bvstr(q);
+
+ return LDAP_SUCCESS;
+}
+
+static int
+certificateExactMatch(
+ int *matchp,
+ slap_mask_t flags,
+ Syntax *syntax,
+ MatchingRule *mr,
+ struct berval *value,
+ void *assertedValue )
+{
+ X509 *xcert;
+ unsigned char *p = value->bv_val;
+ struct berval *serial;
+ struct berval *issuer_dn;
+ struct berval *asserted_serial;
+ struct berval *asserted_issuer_dn;
+ int ret;
+
+ xcert = d2i_X509(NULL, &p, value->bv_len);
+ if ( !xcert ) {
+ ERR_error_string(ERR_get_error(),NULL);
+ }
+
+ serial = asn1_integer2str(xcert->cert_info->serialNumber);
+ issuer_dn = dn_openssl2ldap(X509_get_issuer_name(xcert));
+
+ X509_free(xcert);
+
+ serial_and_issuer_parse(assertedValue,
+ &asserted_serial,
+ &asserted_issuer_dn);
+
+ ret = integerMatch(
+ matchp,
+ flags,
+ slap_schema.si_syn_integer,
+ slap_schema.si_mr_integerMatch,
+ serial,
+ asserted_serial);
+ if ( ret == LDAP_SUCCESS ) {
+ if ( *matchp == 0 ) {
+ ret = dnMatch(
+ matchp,
+ flags,
+ slap_schema.si_syn_distinguishedName,
+ slap_schema.si_mr_distinguishedNameMatch,
+ issuer_dn,
+ asserted_issuer_dn);
+ }
+ }
+
+ ber_bvfree(serial);
+ ber_bvfree(issuer_dn);
+ ber_bvfree(asserted_serial);
+ ber_bvfree(asserted_issuer_dn);
+
+ return ret;
+}
+#endif
+
static int
check_time_syntax (struct berval *val,
int start,
}
switch ( tzoffset ) {
- case -1: /* negativ offset to UTC, ie west of Greenwich */
+ case -1: /* negativ offset to UTC, ie west of Greenwich */
parts[4] += parts[7];
parts[5] += parts[8];
for (part = 6; --part > 0; ) { /* offset is just hhmm, no seconds */
p = (char *)val->bv_val;
e = p + val->bv_len;
-#if 0
- /* syntax does not allow leading white space */
- /* Ignore initial whitespace */
- while ( ( p < e ) && ASCII_SPACE( *p ) ) {
- p++;
- }
-#endif
-
if ( *p != '(' /*')'*/ ) {
return LDAP_INVALID_SYNTAX;
}
p++;
-#if 0
- /* syntax does not allow trailing white space */
- /* Ignore trailing whitespace */
- while ( ( p < e ) && ASCII_SPACE( *p ) ) {
- p++;
- }
-#endif
-
if (p != e) {
return LDAP_INVALID_SYNTAX;
}
#endif
};
-#define X_HIDE "X-HIDE 'TRUE' "
#define X_BINARY "X-BINARY-TRANSFER-REQUIRED 'TRUE' "
#define X_NOT_H_R "X-NOT-HUMAN-READABLE 'TRUE' "
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.4 DESC 'Audio' " X_NOT_H_R ")",
SLAP_SYNTAX_BLOB, blobValidate, NULL, NULL},
- {"( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' " X_BINARY X_NOT_H_R ")",
+ {"( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' " 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, NULL, NULL, NULL},
+ 0, countryStringValidate, IA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'Distinguished Name' )",
0, dnValidate, dnNormalize, dnPretty},
{"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )",
{"( 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, IA5StringValidate, faxNumberNormalize, NULL},
+ 0, printablesStringValidate, IA5StringNormalize, 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' )",
{"( 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, nameUIDPretty},
+ 0, nameUIDValidate, nameUIDNormalize, 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, IA5StringValidate, numericStringNormalize, NULL},
+ 0, numericStringValidate, numericStringNormalize, 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, NULL, NULL, NULL},
+ 0, IA5StringValidate, IA5StringNormalize, 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, blobValidate, NULL, NULL},
+ 0, UTF8StringValidate, UTF8StringNormalize, 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, NULL, NULL},
+ 0, printableStringValidate, IA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.49 DESC 'Supported Algorithm' "
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, IA5StringValidate, phoneNumberNormalize, NULL},
+ 0, printableStringValidate, IA5StringNormalize, 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, IA5StringValidate, telexNumberNormalize, NULL},
+ 0, printableStringValidate, IA5StringNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.53 DESC 'UTC Time' )",
0, utcTimeValidate, utcTimeNormalize, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.54 DESC 'LDAP Syntax Description' )",
0, NULL, NULL, NULL},
/* RFC 2307 NIS Syntaxes */
- {"( 1.3.6.1.1.1.0.0 DESC 'RFC2307 NIS Triple' )",
+ {"( 1.3.6.1.1.1.0.0 DESC 'RFC2307 NIS Netgroup Triple' )",
0, nisNetgroupTripleValidate, NULL, NULL},
{"( 1.3.6.1.1.1.0.1 DESC 'RFC2307 Boot Parameter' )",
0, bootParameterValidate, NULL, NULL},
+#ifdef HAVE_TLS
+ /* From PKIX */
+ /* These OIDs are not published yet, but will be in the next
+ * I-D for PKIX LDAPv3 schema as have been advanced by David
+ * Chadwick in private mail.
+ */
+ {"( 1.2.826.0.1.3344810.7.1 DESC 'Serial Number and Issuer' )",
+ 0, NULL, NULL, NULL},
+#endif
+
/* OpenLDAP Experimental Syntaxes */
{"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )",
- 0, IA5StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
+ 0, UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
NULL, NULL},
{"( 1.3.6.1.4.1.4203.666.2.2 DESC 'OpenLDAP authPassword' )",
0, NULL, NULL, NULL},
/* OpenLDAP Void Syntax */
- {"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' " X_HIDE ")" ,
+ {"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' )" ,
SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
{NULL, 0, NULL, NULL, NULL}
};
* Other matching rules in X.520 that we do not use (yet):
*
* 2.5.13.9 numericStringOrderingMatch
- * 2.5.13.13 booleanMatch
* 2.5.13.15 integerOrderingMatch
* 2.5.13.18 octetStringOrderingMatch
* 2.5.13.19 octetStringSubstringsMatch
* 2.5.13.31 directoryStringFirstComponentMatch
* 2.5.13.32 wordMatch
* 2.5.13.33 keywordMatch
- * 2.5.13.34 certificateExactMatch
* 2.5.13.35 certificateMatch
* 2.5.13.36 certificatePairExactMatch
* 2.5.13.37 certificatePairMatch
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT,
NULL, NULL,
- directoryStringApproxMatch, NULL, NULL,
+ directoryStringApproxMatch,
+ directoryStringApproxIndexer,
+ directoryStringApproxFilter,
NULL},
{"( " IA5StringApproxMatchOID " NAME 'IA5StringApproxMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT,
NULL, NULL,
- IA5StringApproxMatch, NULL, NULL,
+ IA5StringApproxMatch,
+ IA5StringApproxIndexer,
+ IA5StringApproxFilter,
NULL},
/*
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- caseIgnoreMatch, caseIgnoreIndexer, caseIgnoreFilter,
+ caseIgnoreMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
directoryStringApproxMatchOID },
{"( 2.5.13.3 NAME 'caseIgnoreOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
SLAP_MR_SUBSTR | SLAP_MR_EXT,
NULL, NULL,
- caseIgnoreSubstringsMatch,
- caseIgnoreSubstringsIndexer,
- caseIgnoreSubstringsFilter,
+ caseExactIgnoreSubstringsMatch,
+ caseExactIgnoreSubstringsIndexer,
+ caseExactIgnoreSubstringsFilter,
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, caseExactIndexer, caseExactFilter,
+ caseExactMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
directoryStringApproxMatchOID },
{"( 2.5.13.6 NAME 'caseExactOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
SLAP_MR_SUBSTR | SLAP_MR_EXT,
NULL, NULL,
- caseExactSubstringsMatch,
- caseExactSubstringsIndexer,
- caseExactSubstringsFilter,
+ caseExactIgnoreSubstringsMatch,
+ caseExactIgnoreSubstringsIndexer,
+ caseExactIgnoreSubstringsFilter,
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,
NULL, NULL,
- caseIgnoreIA5Match, NULL, NULL,
+ caseIgnoreIA5Match,
+ caseIgnoreIA5Indexer,
+ caseIgnoreIA5Filter,
NULL},
{"( 2.5.13.10 NAME 'numericStringSubstringsMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- integerMatch, NULL, NULL,
+ integerMatch, integerIndexer, integerFilter,
NULL},
{"( 2.5.13.16 NAME 'bitStringMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- telephoneNumberMatch, NULL, NULL,
+ 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, 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,
NULL, NULL,
- presentationAddressMatch, NULL, NULL,
+ NULL, NULL, NULL,
NULL},
{"( 2.5.13.23 NAME 'uniqueMemberMatch' "
objectIdentifierFirstComponentMatch, NULL, NULL,
NULL},
+#ifdef HAVE_TLS
+ {"( 2.5.13.34 NAME 'certificateExactMatch' "
+ "SYNTAX 1.2.826.0.1.3344810.7.1 )",
+ SLAP_MR_EQUALITY | SLAP_MR_EXT,
+ NULL, NULL,
+ certificateExactMatch, NULL, NULL,
+ NULL},
+#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,
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
SLAP_MR_EQUALITY | SLAP_MR_EXT,
NULL, NULL,
- caseIgnoreIA5Match, caseExactIA5Indexer, caseExactIA5Filter,
+ caseIgnoreIA5Match, caseIgnoreIA5Indexer, caseIgnoreIA5Filter,
IA5StringApproxMatchOID },
{"( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch' "
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,
+ 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,
+ NULL},
+
{NULL, SLAP_MR_NONE, NULL, NULL, NULL, NULL}
};
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_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_ber2str,
syntax_defs[i].sd_str2ber
#endif
);
mrule_defs[i].mrd_usage,
mrule_defs[i].mrd_convert,
mrule_defs[i].mrd_normalize,
- mrule_defs[i].mrd_match,
+ mrule_defs[i].mrd_match,
mrule_defs[i].mrd_indexer,
mrule_defs[i].mrd_filter,
mrule_defs[i].mrd_associated );
projects / openldap / blobdiff