#include "slap.h"
#include "ldap_pvt.h"
+#include "lber_pvt.h"
#include "ldap_utf8.h"
#define generalizedTimeMatch caseIgnoreIA5Match
#define generalizedTimeOrderingMatch caseIgnoreIA5Match
#define uniqueMemberMatch dnMatch
+#define integerFirstComponentMatch integerMatch
/* approx matching rules */
#define directoryStringApproxMatchOID "1.3.6.1.4.1.4203.666.4.4"
#define IA5StringApproxIndexer approxIndexer
#define IA5StringApproxFilter approxFilter
-/* orderring matching rules */
+/* ordering matching rules */
#define caseIgnoreOrderingMatch caseIgnoreMatch
#define caseExactOrderingMatch caseExactMatch
+#define integerOrderingMatch integerMatch
/* unimplemented matching routines */
#define caseIgnoreListMatch NULL
#define caseIgnoreListSubstringsMatch NULL
#define protocolInformationMatch NULL
-#define integerFirstComponentMatch NULL
+#ifdef SLAPD_ACI_ENABLED
#define OpenLDAPaciMatch NULL
+#endif
+#ifdef SLAPD_AUTHPASSWD
#define authPasswordMatch NULL
+#endif
/* recycled indexing/filtering routines */
#define dnIndexer caseExactIgnoreIndexer
#define telephoneNumberSubstringsIndexer caseIgnoreIA5SubstringsIndexer
#define telephoneNumberSubstringsFilter caseIgnoreIA5SubstringsFilter
-/* must match OIDs below */
-#define caseExactMatchOID "2.5.13.5"
-#define caseExactSubstringsMatchOID "2.5.13.7"
+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 }
+};
+
-static char *strcasechr( const char *str, int c )
+static char *bvcasechr( struct berval *bv, unsigned char c, ber_len_t *len )
{
- char *lower = strchr( str, TOLOWER(c) );
- char *upper = strchr( str, TOUPPER(c) );
+ ber_len_t i;
+ char lower = TOLOWER( c );
+ char upper = TOUPPER( c );
- if( lower && upper ) {
- return lower < upper ? lower : upper;
- } else if ( lower ) {
- return lower;
- } else {
- return upper;
+ if( c == 0 ) return NULL;
+
+ for( i=0; i < bv->bv_len; i++ ) {
+ if( upper == bv->bv_val[i] || lower == bv->bv_val[i] ) {
+ *len = i;
+ return &bv->bv_val[i];
+ }
}
+
+ return NULL;
}
static int
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
int i;
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value = (struct berval *) assertValue;
rc = dnValidate( NULL, &dn );
- ber_memfree( &dn );
+ ber_memfree( dn.bv_val );
return rc;
}
for( count = in->bv_len; count > 0; count-=len, u+=len ) {
/* get the length indicated by the first byte */
- len = LDAP_UTF8_CHARLEN( u );
+ len = LDAP_UTF8_CHARLEN2( u, len );
- /* should not be zero */
- if( len == 0 ) return LDAP_INVALID_SYNTAX;
+ /* very basic checks */
+ switch( len ) {
+ case 6:
+ if( (u[5] & 0xC0) != 0x80 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ case 5:
+ if( (u[4] & 0xC0) != 0x80 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ case 4:
+ if( (u[3] & 0xC0) != 0x80 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ case 3:
+ if( (u[2] & 0xC0 )!= 0x80 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ case 2:
+ if( (u[1] & 0xC0) != 0x80 ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+ case 1:
+ /* CHARLEN already validated it */
+ break;
+ default:
+ return LDAP_INVALID_SYNTAX;
+ }
/* make sure len corresponds with the offset
to the next character */
struct berval *val,
struct berval *normalized )
{
- char *p, *q, *s;
+ char *p, *q, *s, *e;
int len = 0;
p = val->bv_val;
/* Ignore initial whitespace */
/* All space is ASCII. All ASCII is 1 byte */
- while ( ASCII_SPACE( *p ) ) {
- p++;
- }
-
- if( *p == '\0' ) {
- return LDAP_INVALID_SYNTAX;
- }
+ for ( ; p < val->bv_val + val->bv_len && ASCII_SPACE( p[ 0 ] ); p++ );
- ber_str2bv( p, val->bv_len - (p - val->bv_val), 1, normalized );
+ ber_mem2bv( p, val->bv_len - (p - val->bv_val), 1, normalized );
+ e = normalized->bv_val + val->bv_len - (p - val->bv_val);
+ assert( normalized->bv_len );
assert( normalized->bv_val );
p = q = normalized->bv_val;
s = NULL;
- while ( *p ) {
+ while ( p < e ) {
q += len;
if ( ASCII_SPACE( *p ) ) {
s = q - len;
}
if( sa->sa_initial.bv_val != NULL ) {
- ber_str2bv( UTF8normalize( &sa->sa_initial, casefold ), 0,
- 0, &nsa->sa_initial );
+ UTF8bvnormalize( &sa->sa_initial, &nsa->sa_initial, casefold );
if( nsa->sa_initial.bv_val == NULL ) {
goto err;
}
}
nsa->sa_any = (struct berval *)ch_malloc( (i + 1) * sizeof(struct berval) );
for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
- ber_str2bv( UTF8normalize( &sa->sa_any[i], casefold ),
- 0, 0, &nsa->sa_any[i] );
+ UTF8bvnormalize( &sa->sa_any[i], &nsa->sa_any[i],
+ casefold );
if( nsa->sa_any[i].bv_val == NULL ) {
goto err;
}
}
if( sa->sa_final.bv_val != NULL ) {
- ber_str2bv( UTF8normalize( &sa->sa_final, casefold ), 0,
- 0, &nsa->sa_final );
+ UTF8bvnormalize( &sa->sa_final, &nsa->sa_final, casefold );
if( nsa->sa_final.bv_val == NULL ) {
goto err;
}
err:
if ( nsa->sa_final.bv_val ) free( nsa->sa_final.bv_val );
- if ( nsa->sa_any )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;
}
-/* Strip characters with the 8th bit set */
-static 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 = AC_MEMCPY(p, q, strlen(q) + 1);
- } else {
- p++;
- }
- }
- return in;
-}
-
#ifndef SLAPD_APPROX_OLDSINGLESTRING
#if defined(SLAPD_APPROX_INITIALS)
struct berval *value,
void *assertedValue )
{
- char *val, *nval, *assertv, **values, **words, *c;
+ struct berval *nval, *assertv;
+ char *val, **values, **words, *c;
int i, count, len, nextchunk=0, nextavail=0;
- size_t avlen;
/* Yes, this is necessary */
- nval = UTF8normalize( value, LDAP_UTF8_NOCASEFOLD );
+ nval = UTF8bvnormalize( value, NULL, LDAP_UTF8_APPROX );
if( nval == NULL ) {
*matchp = 1;
return LDAP_SUCCESS;
}
- strip8bitChars( nval );
/* Yes, this is necessary */
- assertv = UTF8normalize( ((struct berval *)assertedValue),
- LDAP_UTF8_NOCASEFOLD );
+ assertv = UTF8bvnormalize( ((struct berval *)assertedValue), NULL, LDAP_UTF8_APPROX );
if( assertv == NULL ) {
- ch_free( nval );
+ ber_bvfree( nval );
*matchp = 1;
return LDAP_SUCCESS;
}
- strip8bitChars( assertv );
- avlen = strlen( assertv );
/* Isolate how many words there are */
- for( c=nval,count=1; *c; c++ ) {
+ for ( c = nval->bv_val, count = 1; *c; c++ ) {
c = strpbrk( c, SLAPD_APPROX_DELIMITER );
if ( c == NULL ) break;
*c = '\0';
/* Get a phonetic copy of each word */
words = (char **)ch_malloc( count * sizeof(char *) );
values = (char **)ch_malloc( count * sizeof(char *) );
- for( c=nval,i=0; i<count; i++,c+=strlen(c)+1 ) {
+ for ( c = nval->bv_val, i = 0; i < count; i++, c += strlen(c) + 1 ) {
words[i] = c;
values[i] = phonetic(c);
}
/* 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 ( (size_t) nextchunk < avlen ) {
- len = strcspn( assertv + nextchunk, SLAPD_APPROX_DELIMITER);
+ while ( (ber_len_t) nextchunk < assertv->bv_len ) {
+ len = strcspn( assertv->bv_val + nextchunk, SLAPD_APPROX_DELIMITER);
if( len == 0 ) {
nextchunk++;
continue;
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 )) {
+ if( !strncasecmp( assertv->bv_val + 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 );
+ assertv->bv_val[nextchunk+len] = '\0';
+ val = phonetic( assertv->bv_val + nextchunk );
/* See if this phonetic chunk is in the remaining words of *value */
for( i=nextavail; i<count; i++ ){
}
/* Cleanup allocs */
- free( assertv );
+ ber_bvfree( assertv );
for( i=0; i<count; i++ ) {
ch_free( values[i] );
}
ch_free( values );
ch_free( words );
- ch_free( nval );
+ ber_bvfree( nval );
return LDAP_SUCCESS;
}
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
- char *val, *c;
+ char *c;
int i,j, len, wordcount, keycount=0;
struct berval *newkeys;
- BVarray keys=NULL;
+ BerVarray keys=NULL;
for( j=0; values[j].bv_val != NULL; j++ ) {
+ struct berval val = { 0, NULL };
/* Yes, this is necessary */
- val = UTF8normalize( &values[j], LDAP_UTF8_NOCASEFOLD );
- strip8bitChars( val );
+ UTF8bvnormalize( &values[j], &val, LDAP_UTF8_APPROX );
+ assert( val.bv_val != NULL );
/* Isolate how many words there are. There will be a key for each */
- for( wordcount=0,c=val; *c; c++) {
+ for( wordcount = 0, c = val.bv_val; *c; c++) {
len = strcspn(c, SLAPD_APPROX_DELIMITER);
if( len >= SLAPD_APPROX_WORDLEN ) wordcount++;
c+= len;
keys = newkeys;
/* Get a phonetic copy of each word */
- for( c=val,i=0; i<wordcount; c+=len+1 ) {
+ for( c = val.bv_val, i = 0; i < wordcount; c += len + 1 ) {
len = strlen( c );
if( len < SLAPD_APPROX_WORDLEN ) continue;
ber_str2bv( phonetic( c ), 0, 0, &keys[keycount] );
i++;
}
- free( val );
+ ber_memfree( val.bv_val );
}
keys[keycount].bv_val = NULL;
*keysp = keys;
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
- char *val, *c;
+ char *c;
int i, count, len;
- BVarray keys;
+ struct berval *val;
+ BerVarray keys;
/* Yes, this is necessary */
- val = UTF8normalize( ((struct berval *)assertValue),
- LDAP_UTF8_NOCASEFOLD );
- if( val == NULL ) {
+ val = UTF8bvnormalize( ((struct berval *)assertValue), NULL, LDAP_UTF8_APPROX );
+ if( val == NULL || val->bv_val == NULL ) {
keys = (struct berval *)ch_malloc( sizeof(struct berval) );
keys[0].bv_val = NULL;
*keysp = keys;
+ ber_bvfree( val );
return LDAP_SUCCESS;
}
- strip8bitChars( val );
/* Isolate how many words there are. There will be a key for each */
- for( count=0,c=val; *c; c++) {
+ for( count = 0,c = val->bv_val; *c; c++) {
len = strcspn(c, SLAPD_APPROX_DELIMITER);
if( len >= SLAPD_APPROX_WORDLEN ) count++;
c+= len;
keys = (struct berval *)ch_malloc( (count + 1) * sizeof(struct berval) );
/* Get a phonetic copy of each word */
- for( c=val,i=0; i<count; c+=len+1 ) {
+ for( c = val->bv_val, i = 0; i < count; c += len + 1 ) {
len = strlen(c);
if( len < SLAPD_APPROX_WORDLEN ) continue;
ber_str2bv( phonetic( c ), 0, 0, &keys[i] );
i++;
}
- free( val );
+ ber_bvfree( val );
keys[count].bv_val = NULL;
*keysp = keys;
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
int i;
- BVarray *keys;
+ BerVarray *keys;
char *s;
for( i=0; values[i].bv_val != NULL; i++ ) {
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
- BVarray keys;
+ BerVarray keys;
char *s;
keys = (struct berval *)ch_malloc( sizeof( struct berval * ) * 2 );
struct berval *value,
void *assertedValue )
{
- *matchp = UTF8normcmp( value->bv_val,
- ((struct berval *) assertedValue)->bv_val,
+ *matchp = UTF8bvnormcmp( value,
+ (struct berval *) assertedValue,
LDAP_UTF8_NOCASEFOLD );
return LDAP_SUCCESS;
}
{
int match = 0;
SubstringsAssertion *sub = NULL;
- struct berval left;
+ struct berval left = { 0, NULL };
int i;
ber_len_t inlen=0;
- char *nav;
+ char *nav = NULL;
unsigned casefold;
- casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ casefold = ( mr != caseExactSubstringsMatchingRule )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
- nav = UTF8normalize( value, casefold );
- if( nav == NULL ) {
+ if ( UTF8bvnormalize( value, &left, casefold ) == NULL ) {
match = 1;
goto done;
}
- left.bv_val = nav;
- left.bv_len = strlen( nav );
+ nav = left.bv_val;
sub = UTF8SubstringsassertionNormalize( assertedValue, casefold );
if( sub == NULL ) {
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 );
-
- if( p == NULL ) {
+ p = ber_bvchr( &left, *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 */
if ( sub->sa_final.bv_val )
ch_free( sub->sa_final.bv_val );
if ( sub->sa_any )
- bvarray_free( sub->sa_any );
+ ber_bvarray_free( sub->sa_any );
if ( sub->sa_initial.bv_val )
ch_free( sub->sa_initial.bv_val );
ch_free( sub );
goto done;
}
- match = strncmp( left.bv_val,
+ match = memcmp( left.bv_val,
sub->sa_any[i].bv_val,
sub->sa_any[i].bv_len );
free( nav );
if( sub != NULL ) {
if ( sub->sa_final.bv_val ) free( sub->sa_final.bv_val );
- if ( sub->sa_any ) bvarray_free( sub->sa_any );
+ if ( sub->sa_any ) ber_bvarray_free( sub->sa_any );
if ( sub->sa_initial.bv_val ) free( sub->sa_initial.bv_val );
ch_free( sub );
}
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
int i;
unsigned casefold;
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
slen = syntax->ssyn_oidlen;
mlen = mr->smr_oidlen;
- casefold = strcmp( mr->smr_oid, caseExactMatchOID )
+ casefold = ( mr != caseExactMatchingRule )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
for( i=0; values[i].bv_val != NULL; i++ ) {
struct berval value;
- ber_str2bv( UTF8normalize( &values[i], casefold ), 0, 0,
- &value );
+ UTF8bvnormalize( &values[i], &value, casefold );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
unsigned casefold;
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
- struct berval value;
+ struct berval value = { 0, NULL };
struct berval digest;
+
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
slen = syntax->ssyn_oidlen;
mlen = mr->smr_oidlen;
- casefold = strcmp( mr->smr_oid, caseExactMatchOID )
+ casefold = ( mr != caseExactMatchingRule )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
- ber_str2bv( UTF8normalize( ((struct berval *) assertValue), casefold ),
- 0, 0, &value );
+ UTF8bvnormalize( (struct berval *) assertValue, &value, casefold );
/* This usually happens if filter contains bad UTF8 */
if( value.bv_val == NULL ) {
keys = ch_malloc( sizeof( struct berval ) );
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
unsigned casefold;
ber_len_t i, nkeys;
size_t slen, mlen;
- BVarray keys;
- BVarray nvalues;
+ BerVarray keys;
+ BerVarray nvalues;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
/* we should have at least one value at this point */
assert( i > 0 );
- casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ casefold = ( mr != caseExactSubstringsMatchingRule )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
nvalues = ch_malloc( sizeof( struct berval ) * (i+1) );
for( i=0; values[i].bv_val != NULL; i++ ) {
- ber_str2bv( UTF8normalize( &values[i], casefold ),
- 0, 0, &nvalues[i] );
+ UTF8bvnormalize( &values[i], &nvalues[i], casefold );
}
nvalues[i].bv_val = NULL;
values = nvalues;
if( nkeys == 0 ) {
/* no keys to generate */
*keysp = NULL;
- bvarray_free( nvalues );
+ ber_bvarray_free( nvalues );
return LDAP_SUCCESS;
}
*keysp = NULL;
}
- bvarray_free( nvalues );
+ ber_bvarray_free( nvalues );
return LDAP_SUCCESS;
}
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
SubstringsAssertion *sa;
char pre;
unsigned casefold;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
- casefold = strcmp( mr->smr_oid, caseExactSubstringsMatchOID )
+ casefold = ( mr != caseExactSubstringsMatchingRule )
? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
sa = UTF8SubstringsassertionNormalize( assertValue, casefold );
if( nkeys == 0 ) {
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
- if ( sa->sa_any ) bvarray_free( sa->sa_any );
+ 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 );
*keysp = NULL;
*keysp = NULL;
}
if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
- if ( sa->sa_any ) bvarray_free( sa->sa_any );
+ 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 );
struct berval *value,
void *assertedValue )
{
- *matchp = UTF8normcmp( value->bv_val,
- ((struct berval *) assertedValue)->bv_val,
+ *matchp = UTF8bvnormcmp( value,
+ (struct berval *) assertedValue,
LDAP_UTF8_CASEFOLD );
return LDAP_SUCCESS;
}
+/* Remove all spaces and '-' characters */
+static int
+telephoneNumberNormalize(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *normalized )
+{
+ char *p, *q;
+
+ q = normalized->bv_val = ch_malloc( val->bv_len + 1 );
+
+ for( p = val->bv_val; *p; p++ )
+ if ( ! ( ASCII_SPACE( *p ) || *p == '-' ))
+ *q++ = *p;
+ *q = '\0';
+
+ normalized->bv_len = q - normalized->bv_val;
+
+ return LDAP_SUCCESS;
+}
+
static int
oidValidate(
Syntax *syntax,
void *assertedValue )
{
char *v, *av;
- int vsign=0, avsign=0;
+ int vsign = 1, avsign = 1; /* default sign = '+' */
struct berval *asserted;
ber_len_t vlen, avlen;
+ int match;
-
- /* Start off pessimistic */
- *matchp = 1;
-
- /* Skip past leading spaces/zeros, and get the sign of the *value number */
+ /* Skip leading space/sign/zeroes, 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 == '-' ) {
+ if( mr == integerFirstComponentMatchingRule ) {
+ char *tmp = memchr( v, '$', vlen );
+ if( tmp )
+ vlen = tmp - v;
+ while( vlen && ASCII_SPACE( v[vlen-1] ))
+ vlen--;
+ }
+ for( ; vlen && ( *v < '1' || '9' < *v ); v++, vlen-- ) /* ANSI 2.2.1 */
+ if( *v == '-' )
vsign = -1;
- }
- else if ( ASCII_DIGIT(*v) ) {
- if ( vsign == 0 ) vsign = 1;
- vsign *= 2;
- break;
- }
- v++;
- vlen--;
- }
+ if( vlen == 0 )
+ vsign = 0;
- /* Skip past leading spaces/zeros, and get the sign of the *assertedValue
- number */
+ /* Do the same with 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 == '-' ) {
+ for( ; avlen && ( *av < '1' || '9' < *av ); av++, avlen-- )
+ if( *av == '-' )
avsign = -1;
- }
- else if ( ASCII_DIGIT(*av) ) {
- if ( avsign == 0 ) avsign = 1;
- avsign *= 2;
- break;
- }
- av++;
- avlen--;
- }
+ if( avlen == 0 )
+ avsign = 0;
- /* 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--;
+ match = vsign - avsign;
+ if( match == 0 ) {
+ match = (vlen != avlen
+ ? ( vlen < avlen ? -1 : 1 )
+ : memcmp( v, av, vlen ));
+ if( vsign < 0 )
+ match = -match;
}
- /* If all digits compared equal, the numbers are equal */
- if(( vlen == 0 ) && ( avlen == 0 )) {
- *matchp = 0;
- }
+ *matchp = match;
return LDAP_SUCCESS;
}
}
else {
normalized->bv_len = len+negative;
- normalized->bv_val = ch_malloc( normalized->bv_len );
+ normalized->bv_val = ch_malloc( normalized->bv_len + 1 );
if( negative ) {
normalized->bv_val[0] = '-';
}
AC_MEMCPY( normalized->bv_val + negative, p, len );
+ normalized->bv_val[len+negative] = '\0';
}
return LDAP_SUCCESS;
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
int i;
- BVarray keys;
-
- /* we should have at least one value at this point */
- assert( values != NULL && values[0].bv_val != NULL );
+ size_t slen, mlen;
+ BerVarray keys;
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
+ struct berval digest;
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
for( i=0; values[i].bv_val != NULL; i++ ) {
- /* empty -- 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 = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
+
for( i=0; values[i].bv_val != NULL; i++ ) {
- integerNormalize( syntax, &values[i], &keys[i] );
+ struct berval norm;
+ integerNormalize( syntax, &values[i], &norm );
+
+ HASH_Init( &HASHcontext );
+ if( prefix != NULL && prefix->bv_len > 0 ) {
+ HASH_Update( &HASHcontext,
+ prefix->bv_val, prefix->bv_len );
+ }
+ HASH_Update( &HASHcontext,
+ syntax->ssyn_oid, slen );
+ HASH_Update( &HASHcontext,
+ mr->smr_oid, mlen );
+ HASH_Update( &HASHcontext,
+ norm.bv_val, norm.bv_len );
+ HASH_Final( HASHdigest, &HASHcontext );
+
+ ber_dupbv( &keys[i], &digest );
+ ch_free( norm.bv_val );
}
keys[i].bv_val = NULL;
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
- BVarray keys;
+ size_t slen, mlen;
+ BerVarray keys;
+ HASH_CONTEXT HASHcontext;
+ unsigned char HASHdigest[HASH_BYTES];
+ struct berval norm;
+ struct berval digest;
+ digest.bv_val = HASHdigest;
+ digest.bv_len = sizeof(HASHdigest);
+
+ slen = syntax->ssyn_oidlen;
+ mlen = mr->smr_oidlen;
+
+ integerNormalize( syntax, assertValue, &norm );
keys = ch_malloc( sizeof( struct berval ) * 2 );
- integerNormalize( syntax, assertValue, &keys[0] );
+
+ HASH_Init( &HASHcontext );
+ if( prefix != NULL && prefix->bv_len > 0 ) {
+ HASH_Update( &HASHcontext,
+ prefix->bv_val, prefix->bv_len );
+ }
+ HASH_Update( &HASHcontext,
+ syntax->ssyn_oid, slen );
+ HASH_Update( &HASHcontext,
+ mr->smr_oid, mlen );
+ HASH_Update( &HASHcontext,
+ norm.bv_val, norm.bv_len );
+ HASH_Final( HASHdigest, &HASHcontext );
+
+ ber_dupbv( &keys[0], &digest );
keys[1].bv_val = NULL;
- *keysp = keys;
+ ch_free( norm.bv_val );
+ *keysp = keys;
return LDAP_SUCCESS;
}
}
idx = p - left.bv_val;
- assert( idx < left.bv_len );
if( idx >= left.bv_len ) {
/* this shouldn't happen */
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
int i;
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
ber_len_t i, nkeys;
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
SubstringsAssertion *sa = assertValue;
char pre;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
continue;
}
- p = strcasechr( left.bv_val, *sub->sa_any[i].bv_val );
+ p = bvcasechr( &left, *sub->sa_any[i].bv_val, &idx );
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;
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
int i;
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
for( i=0; values[i].bv_val != NULL; i++ ) {
struct berval value;
ber_dupbv( &value, &values[i] );
- ldap_pvt_str2upper( value.bv_val );
+ ldap_pvt_str2lower( value.bv_val );
HASH_Init( &HASHcontext );
if( prefix != NULL && prefix->bv_len > 0 ) {
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval value;
mlen = mr->smr_oidlen;
ber_dupbv( &value, (struct berval *) assertValue );
- ldap_pvt_str2upper( value.bv_val );
+ ldap_pvt_str2lower( value.bv_val );
keys = ch_malloc( sizeof( struct berval ) * 2 );
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
ber_len_t i, nkeys;
size_t slen, mlen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
ber_dupbv( &value, &values[i] );
- ldap_pvt_str2upper( value.bv_val );
+ ldap_pvt_str2lower( value.bv_val );
if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
( value.bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
SubstringsAssertion *sa = assertValue;
char pre;
ber_len_t nkeys = 0;
size_t slen, mlen, klen;
- BVarray keys;
+ BerVarray keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
struct berval value;
{
pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
ber_dupbv( &value, &sa->sa_initial );
- ldap_pvt_str2upper( value.bv_val );
+ ldap_pvt_str2lower( value.bv_val );
klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
}
ber_dupbv( &value, &sa->sa_any[i] );
- ldap_pvt_str2upper( value.bv_val );
+ ldap_pvt_str2lower( value.bv_val );
for(j=0;
j <= value.bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
{
pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
ber_dupbv( &value, &sa->sa_final );
- ldap_pvt_str2upper( value.bv_val );
+ ldap_pvt_str2lower( value.bv_val );
klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
*/
static struct berval *
-asn1_integer2str(ASN1_INTEGER *a)
+asn1_integer2str(ASN1_INTEGER *a, struct berval *bv)
{
char buf[256];
char *p;
*--p = '-';
}
- return ber_bvstrdup(p);
-}
-
-/* Get a DN in RFC2253 format from a X509_NAME internal struct */
-static struct berval *
-dn_openssl2ldap(X509_NAME *name)
-{
- char issuer_dn[1024];
- BIO *bio;
-
- bio = BIO_new(BIO_s_mem());
- if ( !bio ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
- "dn_openssl2ldap: error creating BIO_s_mem: %s\n",
- ERR_error_string(ERR_get_error(),NULL)));
-#else
- Debug( LDAP_DEBUG_ARGS, "dn_openssl2ldap: "
- "error creating BIO: %s\n",
- ERR_error_string(ERR_get_error(),NULL), NULL, NULL );
-#endif
- 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);
+ return ber_str2bv( p, 0, 1, bv );
}
/*
{
X509 *xcert;
unsigned char *p = in->bv_val;
- struct berval *serial;
- struct berval *issuer_dn;
- struct berval *bv_tmp;
+ struct berval serial;
+ struct berval issuer_dn;
xcert = d2i_X509(NULL, &p, in->bv_len);
if ( !xcert ) {
return LDAP_INVALID_SYNTAX;
}
- serial = asn1_integer2str(xcert->cert_info->serialNumber);
- if ( !serial ) {
+ if ( !asn1_integer2str(xcert->cert_info->serialNumber, &serial) ) {
X509_free(xcert);
return LDAP_INVALID_SYNTAX;
}
- issuer_dn = dn_openssl2ldap(X509_get_issuer_name(xcert));
- if ( !issuer_dn ) {
+ if ( dnX509normalize(X509_get_issuer_name(xcert), &issuer_dn ) != LDAP_SUCCESS ) {
X509_free(xcert);
- ber_bvfree(serial);
+ ber_memfree(serial.bv_val);
return LDAP_INVALID_SYNTAX;
}
- /* Actually, dn_openssl2ldap returns in a normalized format, but
- it is different from our normalized format */
- bv_tmp = issuer_dn;
- if ( dnNormalize(NULL, bv_tmp, &issuer_dn) != LDAP_SUCCESS ) {
- X509_free(xcert);
- ber_bvfree(serial);
- ber_bvfree(bv_tmp);
- return LDAP_INVALID_SYNTAX;
- }
- ber_bvfree(bv_tmp);
X509_free(xcert);
- out->bv_len = serial->bv_len + issuer_dn->bv_len + sizeof(" $ ");
+ out->bv_len = serial.bv_len + issuer_dn.bv_len + sizeof(" $ ");
out->bv_val = ch_malloc(out->bv_len);
p = out->bv_val;
- AC_MEMCPY(p, serial->bv_val, serial->bv_len);
- p += serial->bv_len;
+ AC_MEMCPY(p, serial.bv_val, serial.bv_len);
+ p += serial.bv_len;
AC_MEMCPY(p, " $ ", sizeof(" $ ")-1);
p += 3;
- AC_MEMCPY(p, issuer_dn->bv_val, issuer_dn->bv_len);
- p += issuer_dn->bv_len;
+ AC_MEMCPY(p, issuer_dn.bv_val, issuer_dn.bv_len);
+ p += issuer_dn.bv_len;
*p++ = '\0';
#ifdef NEW_LOGGING
out->bv_val, NULL, NULL );
#endif
- ber_bvfree(serial);
- ber_bvfree(issuer_dn);
+ ber_memfree(serial.bv_val);
+ ber_memfree(issuer_dn.bv_val);
return LDAP_SUCCESS;
}
static int
serial_and_issuer_parse(
struct berval *assertion,
- struct berval **serial,
- struct berval **issuer_dn
+ struct berval *serial,
+ struct berval *issuer_dn
)
{
char *begin;
bv.bv_len = end-begin+1;
bv.bv_val = begin;
- *serial = ber_dupbv(NULL, &bv);
+ ber_dupbv(serial, &bv);
/* 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))
- begin++;
- /* should we trim spaces at the end too? is it safe always? */
+ 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? */
- bv.bv_len = end-begin+1;
- bv.bv_val = begin;
- dnNormalize( NULL, &bv, issuer_dn );
+ bv.bv_len = end-begin+1;
+ bv.bv_val = begin;
+ dnNormalize2( NULL, &bv, issuer_dn );
+ }
return LDAP_SUCCESS;
}
{
X509 *xcert;
unsigned char *p = value->bv_val;
- struct berval *serial;
- struct berval *issuer_dn;
- struct berval *asserted_serial;
- struct berval *asserted_issuer_dn;
+ 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);
return LDAP_INVALID_SYNTAX;
}
- serial = asn1_integer2str(xcert->cert_info->serialNumber);
- issuer_dn = dn_openssl2ldap(X509_get_issuer_name(xcert));
+ asn1_integer2str(xcert->cert_info->serialNumber, &serial);
+ dnX509normalize(X509_get_issuer_name(xcert), &issuer_dn);
X509_free(xcert);
flags,
slap_schema.si_syn_integer,
slap_schema.si_mr_integerMatch,
- serial,
- asserted_serial);
+ &serial,
+ &asserted_serial);
if ( ret == LDAP_SUCCESS ) {
if ( *matchp == 0 ) {
/* We need to normalize everything for dnMatch */
flags,
slap_schema.si_syn_distinguishedName,
slap_schema.si_mr_distinguishedNameMatch,
- issuer_dn,
- asserted_issuer_dn);
+ &issuer_dn,
+ &asserted_issuer_dn);
}
}
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"certificateExactMatch: %d\n %s $ %s\n %s $ %s\n",
- *matchp, serial->bv_val, issuer_dn->bv_val,
- asserted->serial->bv_val, asserted_issuer_dn->bv_val));
+ *matchp, serial.bv_val, issuer_dn.bv_val,
+ asserted_serial.bv_val, asserted_issuer_dn.bv_val));
#else
Debug( LDAP_DEBUG_ARGS, "certificateExactMatch "
"%d\n\t\"%s $ %s\"\n",
- *matchp, serial->bv_val, issuer_dn->bv_val );
+ *matchp, serial.bv_val, issuer_dn.bv_val );
Debug( LDAP_DEBUG_ARGS, "\t\"%s $ %s\"\n",
- asserted_serial->bv_val, asserted_issuer_dn->bv_val,
+ asserted_serial.bv_val, asserted_issuer_dn.bv_val,
NULL );
#endif
- ber_bvfree(serial);
- ber_bvfree(issuer_dn);
- ber_bvfree(asserted_serial);
- ber_bvfree(asserted_issuer_dn);
+ ber_memfree(serial.bv_val);
+ ber_memfree(issuer_dn.bv_val);
+ ber_memfree(asserted_serial.bv_val);
+ ber_memfree(asserted_issuer_dn.bv_val);
return ret;
}
Syntax *syntax,
MatchingRule *mr,
struct berval *prefix,
- BVarray values,
- BVarray *keysp )
+ BerVarray values,
+ BerVarray *keysp )
{
int i;
- BVarray keys;
+ BerVarray keys;
X509 *xcert;
unsigned char *p;
- struct berval * serial;
+ struct berval serial;
/* we should have at least one value at this point */
assert( values != NULL && values[0].bv_val != NULL );
return LDAP_INVALID_SYNTAX;
}
- serial = asn1_integer2str(xcert->cert_info->serialNumber);
+ asn1_integer2str(xcert->cert_info->serialNumber, &serial);
X509_free(xcert);
integerNormalize( slap_schema.si_syn_integer,
- serial,
+ &serial,
&keys[i] );
- ber_bvfree(serial);
+ ber_memfree(serial.bv_val);
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"certificateExactIndexer: returning: %s\n",
MatchingRule *mr,
struct berval *prefix,
void * assertValue,
- BVarray *keysp )
+ BerVarray *keysp )
{
- BVarray keys;
- struct berval *asserted_serial;
- struct berval *asserted_issuer_dn;
+ BerVarray keys;
+ struct berval asserted_serial;
serial_and_issuer_parse(assertValue,
&asserted_serial,
- &asserted_issuer_dn);
+ NULL);
keys = ch_malloc( sizeof( struct berval ) * 2 );
- integerNormalize( syntax, asserted_serial, &keys[0] );
+ integerNormalize( syntax, &asserted_serial, &keys[0] );
keys[1].bv_val = NULL;
*keysp = keys;
- ber_bvfree(asserted_serial);
- ber_bvfree(asserted_issuer_dn);
+ ber_memfree(asserted_serial.bv_val);
return LDAP_SUCCESS;
}
#endif
return LDAP_SUCCESS;
}
+#ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
static int
utcTimeNormalize(
Syntax *syntax,
return LDAP_SUCCESS;
}
+#endif
+#ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
static int
utcTimeValidate(
Syntax *syntax,
return check_time_syntax(in, 1, parts);
}
+#endif
static int
generalizedTimeValidate(
{"( 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, IA5StringNormalize, NULL},
+ 0, printablesStringValidate, telephoneNumberNormalize, 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' )",
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, IA5StringNormalize, NULL},
+ 0, printableStringValidate, telephoneNumberNormalize, 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},
+#ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
{"( 1.3.6.1.4.1.1466.115.121.1.53 DESC 'UTC Time' )",
0, utcTimeValidate, utcTimeNormalize, NULL},
+#endif
{"( 1.3.6.1.4.1.1466.115.121.1.54 DESC 'LDAP Syntax Description' )",
0, NULL, NULL, NULL},
{"( 1.3.6.1.4.1.1466.115.121.1.55 DESC 'Modify Rights' )",
#endif
/* OpenLDAP Experimental Syntaxes */
+#ifdef SLAPD_ACI_ENABLED
{"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )",
SLAP_SYNTAX_HIDE,
UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
NULL, NULL},
+#endif
+#ifdef SLAPD_AUTHPASSWD
/* needs updating */
{"( 1.3.6.1.4.1.4203.666.2.2 DESC 'OpenLDAP authPassword' )",
SLAP_SYNTAX_HIDE, NULL, NULL, NULL},
+#endif
/* OpenLDAP Void Syntax */
{"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' )" ,
* Other matching rules in X.520 that we do not use (yet):
*
* 2.5.13.9 numericStringOrderingMatch
- * 2.5.13.15 integerOrderingMatch
* 2.5.13.18 octetStringOrderingMatch
* 2.5.13.19 octetStringSubstringsMatch
* 2.5.13.25 uTCTimeMatch
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,
+ 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,
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 )",
NULL, NULL,
authPasswordMatch, NULL, NULL,
NULL},
+#endif
+#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,
NULL, NULL,
OpenLDAPaciMatch, NULL, NULL,
NULL},
+#endif
{"( 1.2.840.113556.1.4.803 NAME 'integerBitAndMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
};
int
-schema_init( void )
+slap_schema_init( void )
{
int res;
int i;
);
if ( res ) {
- fprintf( stderr, "schema_init: Error registering syntax %s\n",
+ fprintf( stderr, "slap_schema_init: Error registering syntax %s\n",
syntax_defs[i].sd_desc );
return LDAP_OTHER;
}
for ( i=0; mrule_defs[i].mrd_desc != NULL; i++ ) {
if( mrule_defs[i].mrd_usage == SLAP_MR_NONE ) {
fprintf( stderr,
- "schema_init: Ingoring unusable matching rule %s\n",
+ "slap_schema_init: Ingoring unusable matching rule %s\n",
mrule_defs[i].mrd_desc );
continue;
}
if ( res ) {
fprintf( stderr,
- "schema_init: Error registering matching rule %s\n",
+ "slap_schema_init: Error registering matching rule %s\n",
mrule_defs[i].mrd_desc );
return LDAP_OTHER;
}
}
+
+ 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 LDAP_SUCCESS;
+ return res;
}
void
schema_destroy( void )
{
+ int i;
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();
syn_destroy();
}
projects / openldap / blobdiff