X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema_init.c;h=13d6667a49ca6ec9119a748daae8e5914ad1d7d6;hb=89812424f4f844053cc2607e3e5e9382b0825bb8;hp=08fc1da9ed9d2caaf535f52f2b40a3f6813447ad;hpb=a35d5b90fca2b5f68e335758fd97a1efaebda83b;p=openldap

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 08fc1da9ed..13d6667a49 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -1,78 +1,19 @@
 /* schema_init.c - init builtin schema */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-/****
-LDAP/X.500 string syntax / matching rules have a few oddities.  This
-comment attempts to detail how slapd(8) treats them.
-
-Summary:
-  StringSyntax		X.500	LDAP	Matching
-  DirectoryString	CHOICE	UTF8	i/e + ignore insignificant spaces
-  PrintableString	subset	subset	i/e + ignore insignificant spaces
-  NumericString		subset	subset  ignore all spaces
-  IA5String			ASCII	ASCII	i/e + ignore insignificant spaces
-  TeletexString		T.61	T.61	i/e + ignore insignificant spaces
-
-  TelephoneNumber subset  subset  i + ignore all spaces and "-"
-
-  See draft-ietf-ldapbis-strpro for details (once published).
-
-
-Directory String -
-  In X.500(93), a directory string can be either a PrintableString,
-  a bmpString, or a UniversalString (e.g., UCS (a subset of Unicode)).
-  In later versions, more CHOICEs were added.  In all cases the string
-  must be non-empty.
-
-  In LDPAv3, a directory string is a UTF-8 encoded UCS string.
-
-  For matching, there are both case ignore and exact rules.  Both
-  also require that "insignificant" spaces be ignored.
-	spaces before the first non-space are ignored;
-	spaces after the last non-space are ignored;
-	spaces after a space are ignored.
-  Note: by these rules (and as clarified in X.520), a string of only
-  spaces is to be treated as if held one space, not empty (which would
-  be a syntax error).
-
-NumericString
-  In ASN.1, numeric string is just a string of digits and spaces and
-  could be empty.  However, in X.500, all attribute values of numeric
-  string carry a non-empty constraint.  For example:
-
-	internationalISDNNumber ATTRIBUTE ::= {
-		WITH SYNTAX InternationalISDNNumber
-		EQUALITY MATCHING RULE numericStringMatch
-		SUBSTRINGS MATCHING RULE numericStringSubstringsMatch
-		ID id-at-internationalISDNNumber }
-	InternationalISDNNumber ::= NumericString (SIZE(1..ub-international-isdn-number))
-
-  Unfornately, some assertion values are don't carry the same constraint
-  (but its unclear how such an assertion could ever be true). In LDAP,
-  there is one syntax (numericString) not two (numericString with constraint,
-  numericString without constraint).  This should be treated as numericString
-  with non-empty constraint.  Note that while someone may have no
-  ISDN number, there are no ISDN numbers which are zero length.
-
-  In matching, spaces are ignored.
-
-PrintableString
-  In ASN.1, Printable string is just a string of printable characters and
-  can be empty.  In X.500, semantics much like NumericString (see serialNumber
-  for a like example) excepting uses insignificant space handling instead of
-  ignore all spaces.  
-
-IA5String
-  Basically same as PrintableString.  There are no examples in X.500, but
-  same logic applies.  So we require them to be non-empty as well.
-
-****/
-
-
 #include "portable.h"
 
 #include <stdio.h>
@@ -89,6 +30,18 @@ IA5String
 
 #include "ldap_utf8.h"
 
+#ifdef HAVE_TLS
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+#include <openssl/crypto.h>
+#include <openssl/pem.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/x509v3.h>
+#include <openssl/ssl.h>
+#endif
+
 #include "lutil_hash.h"
 #define HASH_BYTES				LUTIL_HASH_BYTES
 #define HASH_CONTEXT			lutil_HASH_CTX
@@ -96,93 +49,64 @@ IA5String
 #define HASH_Update(c,buf,len)	lutil_HASHUpdate(c,buf,len)
 #define HASH_Final(d,c)			lutil_HASHFinal(d,c)
 
-/* recycled validatation routines */
-#define berValidate						blobValidate
-
-/* unimplemented pretters */
-#define integerPretty					NULL
-
-/* recycled matching routines */
-#define bitStringMatch					octetStringMatch
-#define numericStringMatch				caseIgnoreIA5Match
-#define objectIdentifierMatch			caseIgnoreIA5Match
-#define telephoneNumberMatch			caseIgnoreIA5Match
-#define telephoneNumberSubstringsMatch	caseIgnoreIA5SubstringsMatch
-#define generalizedTimeMatch			caseIgnoreIA5Match
-#define generalizedTimeOrderingMatch	caseIgnoreIA5Match
-#define uniqueMemberMatch				dnMatch
-#define integerFirstComponentMatch		integerMatch
+#define	OpenLDAPaciMatch			NULL
 
 /* approx matching rules */
 #define directoryStringApproxMatchOID	"1.3.6.1.4.1.4203.666.4.4"
-#define directoryStringApproxMatch	approxMatch
+#define directoryStringApproxMatch		approxMatch
 #define directoryStringApproxIndexer	approxIndexer
-#define directoryStringApproxFilter	approxFilter
+#define directoryStringApproxFilter		approxFilter
 #define IA5StringApproxMatchOID			"1.3.6.1.4.1.4203.666.4.5"
 #define IA5StringApproxMatch			approxMatch
 #define IA5StringApproxIndexer			approxIndexer
 #define IA5StringApproxFilter			approxFilter
 
-/* ordering matching rules */
-#define caseIgnoreOrderingMatch			caseIgnoreMatch
-#define caseExactOrderingMatch			caseExactMatch
-#define integerOrderingMatch			integerMatch
-
-/* unimplemented matching routines */
-#define caseIgnoreListMatch				NULL
-#define caseIgnoreListSubstringsMatch	NULL
-#define protocolInformationMatch		NULL
-
-#ifdef SLAPD_ACI_ENABLED
-#define OpenLDAPaciMatch				NULL
-#endif
-#ifdef SLAPD_AUTHPASSWD
-#define authPasswordMatch				NULL
-#endif
+static int
+inValidate(
+	Syntax *syntax,
+	struct berval *in )
+{
+	/* no value allowed */
+	return LDAP_INVALID_SYNTAX;
+}
 
-/* recycled indexing/filtering routines */
-#define dnIndexer				caseExactIgnoreIndexer
-#define dnFilter				caseExactIgnoreFilter
-#define bitStringFilter			octetStringFilter
-#define bitStringIndexer		octetStringIndexer
-
-#define telephoneNumberIndexer			caseIgnoreIA5Indexer
-#define telephoneNumberFilter			caseIgnoreIA5Filter
-#define telephoneNumberSubstringsIndexer	caseIgnoreIA5SubstringsIndexer
-#define telephoneNumberSubstringsFilter		caseIgnoreIA5SubstringsFilter
-
-static MatchingRule *caseExactMatchingRule;
-static MatchingRule *caseExactSubstringsMatchingRule;
-static MatchingRule *integerFirstComponentMatchingRule;
-
-static const struct MatchingRulePtr {
-	const char   *oid;
-	MatchingRule **mr;
-} mr_ptr [] = {
-	/* must match OIDs below */
-	{ "2.5.13.5",  &caseExactMatchingRule },
-	{ "2.5.13.7",  &caseExactSubstringsMatchingRule },
-	{ "2.5.13.29", &integerFirstComponentMatchingRule }
-};
+static int
+blobValidate(
+	Syntax *syntax,
+	struct berval *in )
+{
+	/* any value allowed */
+	return LDAP_SUCCESS;
+}
 
+#define berValidate blobValidate
 
-static char *bvcasechr( struct berval *bv, unsigned char c, ber_len_t *len )
+static int
+sequenceValidate(
+	Syntax *syntax,
+	struct berval *in )
 {
-	ber_len_t i;
-	char lower = TOLOWER( c );
-	char upper = TOUPPER( c );
+	if ( in->bv_len < 2 ) return LDAP_INVALID_SYNTAX;
+	if ( in->bv_val[0] != LBER_SEQUENCE ) return LDAP_INVALID_SYNTAX;
 
-	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 LDAP_SUCCESS;
+}
 
-	return NULL;
+
+#ifdef HAVE_TLS
+static int certificateValidate( Syntax *syntax, struct berval *in )
+{
+	X509 *xcert=NULL;
+	unsigned char *p = (unsigned char *)in->bv_val;
+ 
+	xcert = d2i_X509(NULL, &p, in->bv_len);
+	if ( !xcert ) return LDAP_INVALID_SYNTAX;
+	X509_free(xcert);
+	return LDAP_SUCCESS;
 }
+#else
+#define certificateValidate sequenceValidate
+#endif
 
 static int
 octetStringMatch(
@@ -193,35 +117,57 @@ octetStringMatch(
 	struct berval *value,
 	void *assertedValue )
 {
-	int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
+	struct berval *asserted = (struct berval *) assertedValue;
+	int match = value->bv_len - asserted->bv_len;
 
 	if( match == 0 ) {
-		match = memcmp( value->bv_val,
-			((struct berval *) assertedValue)->bv_val,
-			value->bv_len );
+		match = memcmp( value->bv_val, asserted->bv_val, value->bv_len );
 	}
 
 	*matchp = match;
 	return LDAP_SUCCESS;
 }
 
+static int
+octetStringOrderingMatch(
+	int *matchp,
+	slap_mask_t flags,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *value,
+	void *assertedValue )
+{
+	struct berval *asserted = (struct berval *) assertedValue;
+	ber_len_t v_len  = value->bv_len;
+	ber_len_t av_len = asserted->bv_len;
+
+	int match = memcmp( value->bv_val, asserted->bv_val,
+		(v_len < av_len ? v_len : av_len) );
+
+	if( match == 0 ) match = v_len - av_len;
+
+	*matchp = match;
+	return LDAP_SUCCESS;
+}
+
 /* Index generation function */
-static int octetStringIndexer(
+int octetStringIndexer(
 	slap_mask_t use,
 	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
 	struct berval *prefix,
 	BerVarray values,
-	BerVarray *keysp )
+	BerVarray *keysp,
+	void *ctx )
 {
 	int i;
 	size_t slen, mlen;
 	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
+	HASH_CONTEXT HASHcontext;
+	unsigned char HASHdigest[HASH_BYTES];
 	struct berval digest;
-	digest.bv_val = HASHdigest;
+	digest.bv_val = (char *)HASHdigest;
 	digest.bv_len = sizeof(HASHdigest);
 
 	for( i=0; values[i].bv_val != NULL; i++ ) {
@@ -231,7 +177,7 @@ static int octetStringIndexer(
 	/* we should have at least one value at this point */
 	assert( i > 0 );
 
-	keys = ch_malloc( sizeof( struct berval ) * (i+1) );
+	keys = sl_malloc( sizeof( struct berval ) * (i+1), ctx );
 
 	slen = syntax->ssyn_oidlen;
 	mlen = mr->smr_oidlen;
@@ -240,20 +186,22 @@ static int octetStringIndexer(
 		HASH_Init( &HASHcontext );
 		if( prefix != NULL && prefix->bv_len > 0 ) {
 			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
+				(unsigned char *)prefix->bv_val,
+				prefix->bv_len );
 		}
 		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
+			(unsigned char *)syntax->ssyn_oid, slen );
 		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
+			(unsigned char *)mr->smr_oid, mlen );
 		HASH_Update( &HASHcontext,
-			values[i].bv_val, values[i].bv_len );
+			(unsigned char *)values[i].bv_val, values[i].bv_len );
 		HASH_Final( HASHdigest, &HASHcontext );
 
-		ber_dupbv( &keys[i], &digest );
+		ber_dupbv_x( &keys[i], &digest, ctx );
 	}
 
 	keys[i].bv_val = NULL;
+	keys[i].bv_len = 0;
 
 	*keysp = keys;
 
@@ -261,44 +209,46 @@ static int octetStringIndexer(
 }
 
 /* Index generation function */
-static int octetStringFilter(
+int octetStringFilter(
 	slap_mask_t use,
 	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
 	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
+	void * assertedValue,
+	BerVarray *keysp,
+	void *ctx )
 {
 	size_t slen, mlen;
 	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval *value = (struct berval *) assertValue;
+	HASH_CONTEXT HASHcontext;
+	unsigned char HASHdigest[HASH_BYTES];
+	struct berval *value = (struct berval *) assertedValue;
 	struct berval digest;
-	digest.bv_val = HASHdigest;
+	digest.bv_val = (char *)HASHdigest;
 	digest.bv_len = sizeof(HASHdigest);
 
 	slen = syntax->ssyn_oidlen;
 	mlen = mr->smr_oidlen;
 
-	keys = ch_malloc( sizeof( struct berval ) * 2 );
+	keys = sl_malloc( sizeof( struct berval ) * 2, ctx );
 
 	HASH_Init( &HASHcontext );
 	if( prefix != NULL && prefix->bv_len > 0 ) {
 		HASH_Update( &HASHcontext,
-			prefix->bv_val, prefix->bv_len );
+			(unsigned char *)prefix->bv_val, prefix->bv_len );
 	}
 	HASH_Update( &HASHcontext,
-		syntax->ssyn_oid, slen );
+		(unsigned char *)syntax->ssyn_oid, slen );
 	HASH_Update( &HASHcontext,
-		mr->smr_oid, mlen );
+		(unsigned char *)mr->smr_oid, mlen );
 	HASH_Update( &HASHcontext,
-		value->bv_val, value->bv_len );
+		(unsigned char *)value->bv_val, value->bv_len );
 	HASH_Final( HASHdigest, &HASHcontext );
 
-	ber_dupbv( keys, &digest );
+	ber_dupbv_x( keys, &digest, ctx );
 	keys[1].bv_val = NULL;
+	keys[1].bv_len = 0;
 
 	*keysp = keys;
 
@@ -306,2487 +256,998 @@ static int octetStringFilter(
 }
 
 static int
-inValidate(
+octetStringSubstringsMatch(
+	int *matchp,
+	slap_mask_t flags,
 	Syntax *syntax,
-	struct berval *in )
+	MatchingRule *mr,
+	struct berval *value,
+	void *assertedValue )
 {
-	/* any value allowed */
-	return LDAP_OTHER;
-}
+	int match = 0;
+	SubstringsAssertion *sub = assertedValue;
+	struct berval left = *value;
+	int i;
+	ber_len_t inlen = 0;
 
-static int
-blobValidate(
-	Syntax *syntax,
-	struct berval *in )
-{
-	/* any value allowed */
-	return LDAP_SUCCESS;
-}
+	/* Add up asserted input length */
+	if( sub->sa_initial.bv_val ) {
+		inlen += sub->sa_initial.bv_len;
+	}
+	if( sub->sa_any ) {
+		for(i=0; sub->sa_any[i].bv_val != NULL; i++) {
+			inlen += sub->sa_any[i].bv_len;
+		}
+	}
+	if( sub->sa_final.bv_val ) {
+		inlen += sub->sa_final.bv_len;
+	}
 
-static int
-bitStringValidate(
-	Syntax *syntax,
-	struct berval *in )
-{
-	ber_len_t i;
+	if( sub->sa_initial.bv_val ) {
+		if( inlen > left.bv_len ) {
+			match = 1;
+			goto done;
+		}
 
-	/* very unforgiving validation, requires no normalization
-	 * before simplistic matching
-	 */
-	if( in->bv_len < 3 ) {
-		return LDAP_INVALID_SYNTAX;
-	}
+		match = memcmp( sub->sa_initial.bv_val, left.bv_val,
+			sub->sa_initial.bv_len );
 
-	/*
-	 * rfc 2252 section 6.3 Bit String
-	 * bitstring = "'" *binary-digit "'"
-	 * binary-digit = "0" / "1"
-	 * example: '0101111101'B
-	 */
-	
-	if( in->bv_val[0] != '\'' ||
-		in->bv_val[in->bv_len-2] != '\'' ||
-		in->bv_val[in->bv_len-1] != 'B' )
-	{
-		return LDAP_INVALID_SYNTAX;
+		if( match != 0 ) {
+			goto done;
+		}
+
+		left.bv_val += sub->sa_initial.bv_len;
+		left.bv_len -= sub->sa_initial.bv_len;
+		inlen -= sub->sa_initial.bv_len;
 	}
 
-	for( i=in->bv_len-3; i>0; i-- ) {
-		if( in->bv_val[i] != '0' && in->bv_val[i] != '1' ) {
-			return LDAP_INVALID_SYNTAX;
+	if( sub->sa_final.bv_val ) {
+		if( inlen > left.bv_len ) {
+			match = 1;
+			goto done;
+		}
+
+		match = memcmp( sub->sa_final.bv_val,
+			&left.bv_val[left.bv_len - sub->sa_final.bv_len],
+			sub->sa_final.bv_len );
+
+		if( match != 0 ) {
+			goto done;
 		}
+
+		left.bv_len -= sub->sa_final.bv_len;
+		inlen -= sub->sa_final.bv_len;
 	}
 
-	return LDAP_SUCCESS;
-}
+	if( sub->sa_any ) {
+		for(i=0; sub->sa_any[i].bv_val; i++) {
+			ber_len_t idx;
+			char *p;
 
-static int
-bitStringNormalize(
-	Syntax *syntax,
-	struct berval *val,
-	struct berval *normalized )
-{
-	/*
-	 * A normalized bitString is has no extaneous (leading) zero bits.
-	 * That is, '00010'B is normalized to '10'B
-	 * However, as a special case, '0'B requires no normalization.
-	 */
-	char *p;
+retry:
+			if( inlen > left.bv_len ) {
+				/* not enough length */
+				match = 1;
+				goto done;
+			}
 
-	/* start at the first bit */
-	p = &val->bv_val[1];
+			if( sub->sa_any[i].bv_len == 0 ) {
+				continue;
+			}
 
-	/* Find the first non-zero bit */
-	while ( *p == '0' ) p++;
+			p = memchr( left.bv_val, *sub->sa_any[i].bv_val, left.bv_len );
 
-	if( *p == '\'' ) {
-		/* no non-zero bits */
-		ber_str2bv( "\'0\'B", sizeof("\'0\'B") - 1, 1, normalized );
-		goto done;
-	}
+			if( p == NULL ) {
+				match = 1;
+				goto done;
+			}
 
-	normalized->bv_val = ch_malloc( val->bv_len + 1 );
+			idx = p - left.bv_val;
 
-	normalized->bv_val[0] = '\'';
-	normalized->bv_len = 1;
+			if( idx >= left.bv_len ) {
+				/* this shouldn't happen */
+				return LDAP_OTHER;
+			}
 
-	for( ; *p != '\0'; p++ ) {
-		normalized->bv_val[normalized->bv_len++] = *p;
-	}
+			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 = memcmp( 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;
+			}
 
-	normalized->bv_val[normalized->bv_len] = '\0';
+			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;
 }
 
+/* Substrings Index generation function */
 static int
-nameUIDValidate(
-	Syntax *syntax,
-	struct berval *in )
-{
-	int rc;
-	struct berval dn;
-
-	if( in->bv_len == 0 ) return LDAP_SUCCESS;
-
-	ber_dupbv( &dn, in );
-	if( !dn.bv_val ) return LDAP_OTHER;
-
-	if( dn.bv_val[dn.bv_len-1] == 'B'
-		&& dn.bv_val[dn.bv_len-2] == '\'' )
-	{
-		/* assume presence of optional UID */
-		ber_len_t i;
-
-		for(i=dn.bv_len-3; i>1; i--) {
-			if( dn.bv_val[i] != '0' &&	dn.bv_val[i] != '1' ) {
-				break;
-			}
-		}
-		if( dn.bv_val[i] != '\'' || dn.bv_val[i-1] != '#' ) {
-			ber_memfree( dn.bv_val );
-			return LDAP_INVALID_SYNTAX;
-		}
-
-		/* trim the UID to allow use of dnValidate */
-		dn.bv_val[i-1] = '\0';
-		dn.bv_len = i-1;
-	}
-
-	rc = dnValidate( NULL, &dn );
-
-	ber_memfree( dn.bv_val );
-	return rc;
-}
-
-static int
-nameUIDNormalize(
-	Syntax *syntax,
-	struct berval *val,
-	struct berval *normalized )
-{
-	struct berval out;
-	int rc;
-
-	ber_dupbv( &out, val );
-	if( out.bv_len != 0 ) {
-		struct berval uidin = { 0, NULL };
-		struct berval uidout = { 0, NULL };
-
-		if( out.bv_val[out.bv_len-1] == 'B'
-			&& out.bv_val[out.bv_len-2] == '\'' )
-		{
-			/* assume presence of optional UID */
-			uidin.bv_val = strrchr( out.bv_val, '#' );
-
-			if( uidin.bv_val == NULL ) {
-				free( out.bv_val );
-				return LDAP_INVALID_SYNTAX;
-			}
-
-			uidin.bv_len = out.bv_len - (uidin.bv_val - out.bv_val);
-			out.bv_len -= uidin.bv_len--;
-
-			/* temporarily trim the UID */
-			*(uidin.bv_val++) = '\0';
-
-			rc = bitStringNormalize( syntax, &uidin, &uidout );
-
-			if( rc != LDAP_SUCCESS ) {
-				free( out.bv_val );
-				return LDAP_INVALID_SYNTAX;
-			}
-		}
-
-#ifdef USE_DN_NORMALIZE
-		rc = dnNormalize2( NULL, &out, normalized );
-#else
-		rc = dnPretty2( NULL, &out, normalized );
-#endif
-
-		if( rc != LDAP_SUCCESS ) {
-			free( out.bv_val );
-			free( uidout.bv_val );
-			return LDAP_INVALID_SYNTAX;
-		}
-
-		if( uidout.bv_len ) {
-			normalized->bv_val = ch_realloc( normalized->bv_val,
-				normalized->bv_len + uidout.bv_len + sizeof("#") );
-
-			/* insert the separator */
-			normalized->bv_val[normalized->bv_len++] = '#';
-
-			/* append the UID */
-			AC_MEMCPY( &normalized->bv_val[normalized->bv_len],
-				uidout.bv_val, uidout.bv_len );
-			normalized->bv_len += uidout.bv_len;
-
-			/* terminate */
-			normalized->bv_val[normalized->bv_len] = '\0';
-		}
-
-		free( out.bv_val );
-	}
-
-	return LDAP_SUCCESS;
-}
-
-/*
- * Handling boolean syntax and matching is quite rigid.
- * A more flexible approach would be to allow a variety
- * of strings to be normalized and prettied into TRUE
- * and FALSE.
- */
-static int
-booleanValidate(
-	Syntax *syntax,
-	struct berval *in )
-{
-	/* very unforgiving validation, requires no normalization
-	 * before simplistic matching
-	 */
-
-	if( in->bv_len == 4 ) {
-		if( !memcmp( in->bv_val, "TRUE", 4 ) ) {
-			return LDAP_SUCCESS;
-		}
-	} else if( in->bv_len == 5 ) {
-		if( !memcmp( in->bv_val, "FALSE", 5 ) ) {
-			return LDAP_SUCCESS;
-		}
-	}
-
-	return LDAP_INVALID_SYNTAX;
-}
-
-static int
-booleanMatch(
-	int *matchp,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
-{
-	/* simplistic matching allowed by rigid validation */
-	struct berval *asserted = (struct berval *) assertedValue;
-	*matchp = value->bv_len != asserted->bv_len;
-	return LDAP_SUCCESS;
-}
-
-static int
-UTF8StringValidate(
-	Syntax *syntax,
-	struct berval *in )
-{
-	ber_len_t count;
-	int len;
-	unsigned char *u = in->bv_val;
-
-	if( !in->bv_len ) return LDAP_INVALID_SYNTAX;
-
-	for( count = in->bv_len; count > 0; count-=len, u+=len ) {
-		/* get the length indicated by the first byte */
-		len = LDAP_UTF8_CHARLEN2( u, len );
-
-		/* 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 */
-		if( LDAP_UTF8_OFFSET( u ) != len ) return LDAP_INVALID_SYNTAX;
-	}
-
-	if( count != 0 ) return LDAP_INVALID_SYNTAX;
-
-	return LDAP_SUCCESS;
-}
-
-static int
-UTF8StringNormalize(
-	Syntax *syntax,
-	struct berval *val,
-	struct berval *normalized )
-{
-	char *p, *q, *s, *e;
-	int len = 0;
-
-	/* validator should have refused an empty string */
-	assert( val->bv_len );
-
-	p = val->bv_val;
-
-	/* Ignore initial whitespace */
-	/* All space is ASCII. All ASCII is 1 byte */
-	for ( ; p < val->bv_val + val->bv_len && ASCII_SPACE( p[ 0 ] ); p++ );
-
-	normalized->bv_len = val->bv_len - (p - val->bv_val);
-
-	if( !normalized->bv_len ) {
-		ber_mem2bv( " ", 1, 1, normalized );
-		return LDAP_SUCCESS;
-	}
-
-	ber_mem2bv( p, normalized->bv_len, 1, normalized );
-	e = normalized->bv_val + normalized->bv_len;
-
-	assert( normalized->bv_val );
-
-	p = q = normalized->bv_val;
-	s = NULL;
-
-	while ( p < e ) {
-		q += len;
-		if ( ASCII_SPACE( *p ) ) {
-			s = q - len;
-			len = 1;
-			*q = *p++;
-
-			/* Ignore the extra whitespace */
-			while ( ASCII_SPACE( *p ) ) {
-				p++;
-			}
-		} else {
-			len = LDAP_UTF8_COPY(q,p);
-			s=NULL;
-			p+=len;
-		}
-	}
-
-	assert( normalized->bv_val <= p );
-	assert( q+len <= p );
-
-	/* cannot start with a space */
-	assert( !ASCII_SPACE(normalized->bv_val[0]) );
-
-	/*
-	 * If the string ended in space, backup the pointer one
-	 * position.  One is enough because the above loop collapsed
-	 * all whitespace to a single space.
-	 */
-
-	if ( s != NULL ) {
-		len = q - s;
-		q = s;
-	}
-
-	/* cannot end with a space */
-	assert( !ASCII_SPACE( *q ) );
-
-	q += len;
-
-	/* null terminate */
-	*q = '\0';
-
-	normalized->bv_len = q - normalized->bv_val;
-
-	return LDAP_SUCCESS;
-}
-
-/* Returns Unicode canonically normalized copy of a substring assertion
- * Skipping attribute description */
-static SubstringsAssertion *
-UTF8SubstringsassertionNormalize(
-	SubstringsAssertion *sa,
-	unsigned casefold )
-{
-	SubstringsAssertion *nsa;
-	int i;
-
-	nsa = (SubstringsAssertion *)ch_calloc( 1, sizeof(SubstringsAssertion) );
-	if( nsa == NULL ) {
-		return NULL;
-	}
-
-	if( sa->sa_initial.bv_val != NULL ) {
-		UTF8bvnormalize( &sa->sa_initial, &nsa->sa_initial, casefold );
-		if( nsa->sa_initial.bv_val == NULL ) {
-			goto err;
-		}
-	}
-
-	if( sa->sa_any != NULL ) {
-		for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
-			/* empty */
-		}
-		nsa->sa_any = (struct berval *)ch_malloc( (i + 1) * sizeof(struct berval) );
-		for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
-			UTF8bvnormalize( &sa->sa_any[i], &nsa->sa_any[i], 
-					casefold );
-			if( nsa->sa_any[i].bv_val == NULL ) {
-				goto err;
-			}
-		}
-		nsa->sa_any[i].bv_val = NULL;
-	}
-
-	if( sa->sa_final.bv_val != NULL ) {
-		UTF8bvnormalize( &sa->sa_final, &nsa->sa_final, casefold );
-		if( nsa->sa_final.bv_val == NULL ) {
-			goto err;
-		}
-	}
-
-	return nsa;
-
-err:
-	if ( nsa->sa_final.bv_val ) free( nsa->sa_final.bv_val );
-	if ( nsa->sa_any )ber_bvarray_free( nsa->sa_any );
-	if ( nsa->sa_initial.bv_val ) free( nsa->sa_initial.bv_val );
-	ch_free( nsa );
-	return NULL;
-}
-
-#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
-approxMatch(
-	int *matchp,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
-{
-	struct berval *nval, *assertv;
-	char *val, **values, **words, *c;
-	int i, count, len, nextchunk=0, nextavail=0;
-
-	/* Yes, this is necessary */
-	nval = UTF8bvnormalize( value, NULL, LDAP_UTF8_APPROX );
-	if( nval == NULL ) {
-		*matchp = 1;
-		return LDAP_SUCCESS;
-	}
-
-	/* Yes, this is necessary */
-	assertv = UTF8bvnormalize( ((struct berval *)assertedValue), NULL, LDAP_UTF8_APPROX );
-	if( assertv == NULL ) {
-		ber_bvfree( nval );
-		*matchp = 1;
-		return LDAP_SUCCESS;
-	}
-
-	/* Isolate how many words there are */
-	for ( c = nval->bv_val, count = 1; *c; c++ ) {
-		c = strpbrk( c, SLAPD_APPROX_DELIMITER );
-		if ( c == NULL ) break;
-		*c = '\0';
-		count++;
-	}
-
-	/* Get a phonetic copy of each word */
-	words = (char **)ch_malloc( count * sizeof(char *) );
-	values = (char **)ch_malloc( count * sizeof(char *) );
-	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 ( (ber_len_t) nextchunk < assertv->bv_len ) {
-		len = strcspn( assertv->bv_val + 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->bv_val + nextchunk, words[i], 1 )) {
-					nextavail=i+1;
-					break;
-				}
-		}
-#endif
-		else {
-			/* Isolate the next word in the asserted value and phonetic it */
-			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++ ){
-				if( !strcmp( val, values[i] ) ){
-					nextavail = i+1;
-					break;
-				}
-			}
-			ch_free( val );
-		}
-
-		/* This chunk in the asserted value was NOT within the *value. */
-		if( i >= count ) {
-			nextavail=-1;
-			break;
-		}
-
-		/* Go on to the next word in the asserted value */
-		nextchunk += len+1;
-	}
-
-	/* If some of the words were seen, call it a match */
-	if( nextavail > 0 ) {
-		*matchp = 0;
-	}
-	else {
-		*matchp = 1;
-	}
-
-	/* Cleanup allocs */
-	ber_bvfree( assertv );
-	for( i=0; i<count; i++ ) {
-		ch_free( values[i] );
-	}
-	ch_free( values );
-	ch_free( words );
-	ber_bvfree( nval );
-
-	return LDAP_SUCCESS;
-}
-
-static int 
-approxIndexer(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
-{
-	char *c;
-	int i,j, len, wordcount, keycount=0;
-	struct berval *newkeys;
-	BerVarray keys=NULL;
-
-	for( j=0; values[j].bv_val != NULL; j++ ) {
-		struct berval val = { 0, NULL };
-		/* Yes, this is necessary */
-		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.bv_val; *c; c++) {
-			len = strcspn(c, SLAPD_APPROX_DELIMITER);
-			if( len >= SLAPD_APPROX_WORDLEN ) wordcount++;
-			c+= len;
-			if (*c == '\0') break;
-			*c = '\0';
-		}
-
-		/* Allocate/increase storage to account for new keys */
-		newkeys = (struct berval *)ch_malloc( (keycount + wordcount + 1) 
-			* sizeof(struct berval) );
-		AC_MEMCPY( newkeys, keys, keycount * sizeof(struct berval) );
-		if( keys ) ch_free( keys );
-		keys = newkeys;
-
-		/* Get a phonetic copy of each word */
-		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] );
-			keycount++;
-			i++;
-		}
-
-		ber_memfree( val.bv_val );
-	}
-	keys[keycount].bv_val = NULL;
-	*keysp = keys;
-
-	return LDAP_SUCCESS;
-}
-
-static int 
-approxFilter(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
-{
-	char *c;
-	int i, count, len;
-	struct berval *val;
-	BerVarray keys;
-
-	/* Yes, this is necessary */
-	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;
-	}
-
-	/* Isolate how many words there are. There will be a key for each */
-	for( count = 0,c = val->bv_val; *c; c++) {
-		len = strcspn(c, SLAPD_APPROX_DELIMITER);
-		if( len >= SLAPD_APPROX_WORDLEN ) count++;
-		c+= len;
-		if (*c == '\0') break;
-		*c = '\0';
-	}
-
-	/* Allocate storage for new keys */
-	keys = (struct berval *)ch_malloc( (count + 1) * sizeof(struct berval) );
-
-	/* Get a phonetic copy of each word */
-	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++;
-	}
-
-	ber_bvfree( val );
-
-	keys[count].bv_val = NULL;
-	*keysp = keys;
-
-	return LDAP_SUCCESS;
-}
-
-
-#else
-/* No other form of Approximate Matching is defined */
-
-static int
-approxMatch(
-	int *matchp,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
-{
-	char *vapprox, *avapprox;
-	char *s, *t;
-
-	/* Yes, this is necessary */
-	s = UTF8normalize( value, UTF8_NOCASEFOLD );
-	if( s == NULL ) {
-		*matchp = 1;
-		return LDAP_SUCCESS;
-	}
-
-	/* Yes, this is necessary */
-	t = UTF8normalize( ((struct berval *)assertedValue),
-			   UTF8_NOCASEFOLD );
-	if( t == NULL ) {
-		free( s );
-		*matchp = -1;
-		return LDAP_SUCCESS;
-	}
-
-	vapprox = phonetic( strip8bitChars( s ) );
-	avapprox = phonetic( strip8bitChars( t ) );
-
-	free( s );
-	free( t );
-
-	*matchp = strcmp( vapprox, avapprox );
-
-	ch_free( vapprox );
-	ch_free( avapprox );
-
-	return LDAP_SUCCESS;
-}
-
-static int 
-approxIndexer(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
-{
-	int i;
-	BerVarray *keys;
-	char *s;
-
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* empty - just count them */
-	}
-
-	/* we should have at least one value at this point */
-	assert( i > 0 );
-
-	keys = (struct berval *)ch_malloc( sizeof( struct berval ) * (i+1) );
-
-	/* Copy each value and run it through phonetic() */
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* Yes, this is necessary */
-		s = UTF8normalize( &values[i], UTF8_NOCASEFOLD );
-
-		/* strip 8-bit chars and run through phonetic() */
-		ber_str2bv( phonetic( strip8bitChars( s ) ), 0, 0, &keys[i] );
-		free( s );
-	}
-	keys[i].bv_val = NULL;
-
-	*keysp = keys;
-	return LDAP_SUCCESS;
-}
-
-
-static int 
-approxFilter(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
-{
-	BerVarray keys;
-	char *s;
-
-	keys = (struct berval *)ch_malloc( sizeof( struct berval * ) * 2 );
-
-	/* Yes, this is necessary */
-	s = UTF8normalize( ((struct berval *)assertValue),
-			     UTF8_NOCASEFOLD );
-	if( s == NULL ) {
-		keys[0] = NULL;
-	} else {
-		/* 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
-caseExactMatch(
-	int *matchp,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
-{
-	*matchp = UTF8bvnormcmp( value,
-		(struct berval *) assertedValue,
-		LDAP_UTF8_NOCASEFOLD );
-	return LDAP_SUCCESS;
-}
-
-static int
-caseExactIgnoreSubstringsMatch(
-	int *matchp,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
-{
-	int match = 0;
-	SubstringsAssertion *sub = NULL;
-	struct berval left = { 0, NULL };
-	int i;
-	ber_len_t inlen=0;
-	char *nav = NULL;
-	unsigned casefold;
-
-	casefold = ( mr != caseExactSubstringsMatchingRule )
-		? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
-
-	if ( UTF8bvnormalize( value, &left, casefold ) == NULL ) {
-		match = 1;
-		goto done;
-	}
-	nav = left.bv_val;
-
-	sub = UTF8SubstringsassertionNormalize( assertedValue, casefold );
-	if( sub == NULL ) {
-		match = -1;
-		goto done;
-	}
-
-	/* Add up asserted input length */
-	if( sub->sa_initial.bv_val ) {
-		inlen += sub->sa_initial.bv_len;
-	}
-	if( sub->sa_any ) {
-		for(i=0; sub->sa_any[i].bv_val != NULL; i++) {
-			inlen += sub->sa_any[i].bv_len;
-		}
-	}
-	if( sub->sa_final.bv_val ) {
-		inlen += sub->sa_final.bv_len;
-	}
-
-	if( sub->sa_initial.bv_val ) {
-		if( inlen > left.bv_len ) {
-			match = 1;
-			goto done;
-		}
-
-		match = memcmp( sub->sa_initial.bv_val, left.bv_val,
-			sub->sa_initial.bv_len );
-
-		if( match != 0 ) {
-			goto done;
-		}
-
-		left.bv_val += sub->sa_initial.bv_len;
-		left.bv_len -= sub->sa_initial.bv_len;
-		inlen -= sub->sa_initial.bv_len;
-	}
-
-	if( sub->sa_final.bv_val ) {
-		if( inlen > left.bv_len ) {
-			match = 1;
-			goto done;
-		}
-
-		match = memcmp( sub->sa_final.bv_val,
-			&left.bv_val[left.bv_len - sub->sa_final.bv_len],
-			sub->sa_final.bv_len );
-
-		if( match != 0 ) {
-			goto done;
-		}
-
-		left.bv_len -= sub->sa_final.bv_len;
-		inlen -= sub->sa_final.bv_len;
-	}
-
-	if( sub->sa_any ) {
-		for(i=0; sub->sa_any[i].bv_val; i++) {
-			ber_len_t idx;
-			char *p;
-
-retry:
-			if( inlen > left.bv_len ) {
-				/* not enough length */
-				match = 1;
-				goto done;
-			}
-
-			if( sub->sa_any[i].bv_len == 0 ) {
-				continue;
-			}
-
-			p = ber_bvchr( &left, *sub->sa_any[i].bv_val );
-			if ( p == NULL ) {
-				match = 1;
-				goto done;
-			}
-
-			idx = p - left.bv_val;
-
-			if( idx >= left.bv_len ) {
-				/* this shouldn't happen */
-				free( nav );
-				if ( sub->sa_final.bv_val )
-					ch_free( sub->sa_final.bv_val );
-				if ( 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 );
-				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 = memcmp( 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:
-	free( nav );
-	if( sub != NULL ) {
-		if ( sub->sa_final.bv_val ) free( sub->sa_final.bv_val );
-		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 );
-	}
-	*matchp = match;
-	return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-static int caseExactIgnoreIndexer(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
-{
-	int i;
-	unsigned casefold;
-	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 */
-	}
-
-	/* 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;
-
-	casefold = ( mr != caseExactMatchingRule )
-		? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
-
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		struct berval value;
-		UTF8bvnormalize( &values[i], &value, casefold );
-
-		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,
-			value.bv_val, value.bv_len );
-		HASH_Final( HASHdigest, &HASHcontext );
-
-		free( value.bv_val );
-
-		ber_dupbv( &keys[i], &digest );
-	}
-
-	keys[i].bv_val = NULL;
-	*keysp = keys;
-	return LDAP_SUCCESS;
-}
-
-/* Index generation function */
-static int caseExactIgnoreFilter(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
-{
-	unsigned casefold;
-	size_t slen, mlen;
-	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	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 = ( mr != caseExactMatchingRule )
-		? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
-
-	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 ) );
-		keys[0].bv_val = NULL;
-		return LDAP_SUCCESS;
-	}
-
-	keys = ch_malloc( sizeof( struct berval ) * 2 );
-
-	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,
-		value.bv_val, value.bv_len );
-	HASH_Final( HASHdigest, &HASHcontext );
-
-	ber_dupbv( keys, &digest );
-	keys[1].bv_val = NULL;
-
-	free( value.bv_val );
-
-	*keysp = keys;
-	return LDAP_SUCCESS;
-}
-
-/* Substrings Index generation function */
-static int caseExactIgnoreSubstringsIndexer(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
-{
-	unsigned casefold;
-	ber_len_t i, nkeys;
-	size_t slen, mlen;
-	BerVarray keys;
-	BerVarray nvalues;
-
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval digest;
-	digest.bv_val = HASHdigest;
-	digest.bv_len = sizeof(HASHdigest);
-
-	nkeys=0;
-
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* empty - just count them */
-	}
-
-	/* we should have at least one value at this point */
-	assert( i > 0 );
-
-	casefold = ( mr != caseExactSubstringsMatchingRule )
-		? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
-
-	nvalues = ch_malloc( sizeof( struct berval ) * (i+1) );
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		UTF8bvnormalize( &values[i], &nvalues[i], casefold );
-	}
-	nvalues[i].bv_val = NULL;
-	values = nvalues;
-
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* count number of indices to generate */
-		if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
-			continue;
-		}
-
-		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 );
-			}
-		}
-	}
-
-	if( nkeys == 0 ) {
-		/* no keys to generate */
-		*keysp = NULL;
-		ber_bvarray_free( nvalues );
-		return LDAP_SUCCESS;
-	}
-
-	keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
-
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
-
-	nkeys=0;
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		ber_len_t j,max;
-
-		if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
-
-		if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
-			( values[i].bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
-		{
-			char pre = SLAP_INDEX_SUBSTR_PREFIX;
-			max = values[i].bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
-
-			for( j=0; j<max; j++ ) {
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&values[i].bv_val[j],
-					SLAP_INDEX_SUBSTR_MAXLEN );
-				HASH_Final( HASHdigest, &HASHcontext );
-
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
-		}
-
-		max = SLAP_INDEX_SUBSTR_MAXLEN < values[i].bv_len
-			? SLAP_INDEX_SUBSTR_MAXLEN : values[i].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;
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					values[i].bv_val, j );
-				HASH_Final( HASHdigest, &HASHcontext );
-
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
-
-			if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
-				pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&values[i].bv_val[values[i].bv_len-j], j );
-				HASH_Final( HASHdigest, &HASHcontext );
-
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
-
-		}
-
-	}
-
-	if( nkeys > 0 ) {
-		keys[nkeys].bv_val = NULL;
-		*keysp = keys;
-	} else {
-		ch_free( keys );
-		*keysp = NULL;
-	}
-
-	ber_bvarray_free( nvalues );
-
-	return LDAP_SUCCESS;
-}
-
-static int caseExactIgnoreSubstringsFilter(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
-{
-	SubstringsAssertion *sa;
-	char pre;
-	unsigned casefold;
-	ber_len_t nkeys = 0;
-	size_t slen, mlen, klen;
-	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval *value;
-	struct berval digest;
-
-	casefold = ( mr != caseExactSubstringsMatchingRule )
-		? LDAP_UTF8_CASEFOLD : LDAP_UTF8_NOCASEFOLD;
-
-	sa = UTF8SubstringsassertionNormalize( assertValue, casefold );
-	if( sa == NULL ) {
-		*keysp = NULL;
-		return LDAP_SUCCESS;
-	}
-
-	if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != 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].bv_val != 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.bv_val != NULL &&
-		sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		nkeys++;
-	}
-
-	if( nkeys == 0 ) {
-		if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
-		if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
-		if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
-		ch_free( sa );
-		*keysp = NULL;
-		return LDAP_SUCCESS;
-	}
-
-	digest.bv_val = HASHdigest;
-	digest.bv_len = sizeof(HASHdigest);
-
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
-
-	keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
-	nkeys = 0;
-
-	if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != 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;
-
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
-		}
-		HASH_Update( &HASHcontext,
-			&pre, sizeof( pre ) );
-		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			value->bv_val, klen );
-		HASH_Final( HASHdigest, &HASHcontext );
-
-		ber_dupbv( &keys[nkeys++], &digest );
-	}
-
-	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].bv_val != NULL; i++ ) {
-			if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
-				continue;
-			}
-
-			value = &sa->sa_any[i];
-
-			for(j=0;
-				j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
-				j += SLAP_INDEX_SUBSTR_STEP )
-			{
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&value->bv_val[j], klen ); 
-				HASH_Final( HASHdigest, &HASHcontext );
-
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
-
-		}
-	}
-
-	if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != 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;
-
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
-		}
-		HASH_Update( &HASHcontext,
-			&pre, sizeof( pre ) );
-		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			&value->bv_val[value->bv_len-klen], klen );
-		HASH_Final( HASHdigest, &HASHcontext );
-
-		ber_dupbv( &keys[nkeys++], &digest );
-	}
-
-	if( nkeys > 0 ) {
-		keys[nkeys].bv_val = NULL;
-		*keysp = keys;
-	} else {
-		ch_free( keys );
-		*keysp = NULL;
-	}
-	if ( sa->sa_final.bv_val ) free( sa->sa_final.bv_val );
-	if ( sa->sa_any ) ber_bvarray_free( sa->sa_any );
-	if ( sa->sa_initial.bv_val ) free( sa->sa_initial.bv_val );
-	ch_free( sa );
-
-	return LDAP_SUCCESS;
-}
-
-static int
-caseIgnoreMatch(
-	int *matchp,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
-{
-	*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;
-
-	/* validator should have refused an empty string */
-	assert( val->bv_len );
-
-	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;
-
-	if( normalized->bv_len == 0 ) {
-		free( normalized->bv_val );
-		return LDAP_INVALID_SYNTAX;
-	}
-
-	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 = 1, avsign = 1;	/* default sign = '+' */
-	struct berval *asserted;
-	ber_len_t vlen, avlen;
-	int match;
-
-	/* Skip leading space/sign/zeroes, and get the sign of the *value number */
-	v = value->bv_val;
-	vlen = value->bv_len;
-	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;
-	if( vlen == 0 )
-		vsign = 0;
-
-	/* Do the same with the *assertedValue number */
-	asserted = (struct berval *) assertedValue;
-	av = asserted->bv_val;
-	avlen = asserted->bv_len;
-	for( ; avlen && ( *av < '1' || '9' < *av ); av++, avlen-- )
-		if( *av == '-' )
-			avsign = -1;
-	if( avlen == 0 )
-		avsign = 0;
-
-	match = vsign - avsign;
-	if( match == 0 ) {
-		match = (vlen != avlen
-			     ? ( vlen < avlen ? -1 : 1 )
-			     : memcmp( v, av, vlen ));
-		if( vsign < 0 )
-			match = -match;
-	}
-
-	*matchp = match;
-	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;
-	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--;
-	}
-
-	/* 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 ) {
-		normalized->bv_val = ch_strdup("0");
-		normalized->bv_len = 1;
-	}
-	else {
-		normalized->bv_len = len+negative;
-		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;
-}
-
-/* Index generation function */
-static int integerIndexer(
+octetStringSubstringsIndexer(
 	slap_mask_t use,
 	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
 	struct berval *prefix,
 	BerVarray values,
-	BerVarray *keysp )
+	BerVarray *keysp,
+	void *ctx )
 {
-	int i;
+	ber_len_t i, j, nkeys;
 	size_t slen, mlen;
 	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
+
+	HASH_CONTEXT HASHcontext;
+	unsigned char HASHdigest[HASH_BYTES];
 	struct berval digest;
-	digest.bv_val = HASHdigest;
+	digest.bv_val = (char *)HASHdigest;
 	digest.bv_len = sizeof(HASHdigest);
 
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* empty - just count them */
-	}
-
-	/* we should have at least one value at this point */
-	assert( i > 0 );
-
-	keys = ch_malloc( sizeof( struct berval ) * (i+1) );
-
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+	nkeys=0;
 
 	for( i=0; values[i].bv_val != NULL; i++ ) {
-		struct berval norm;
-		integerNormalize( syntax, &values[i], &norm );
+		/* count number of indices to generate */
+		if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
+			continue;
+		}
 
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
+		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);
+			}
 		}
-		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 );
+		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);
+			}
+		}
 	}
 
-	keys[i].bv_val = NULL;
-	*keysp = keys;
-	return LDAP_SUCCESS;
-}
+	if( nkeys == 0 ) {
+		/* no keys to generate */
+		*keysp = NULL;
+		return LDAP_SUCCESS;
+	}
 
-/* Index generation function */
-static int integerFilter(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
-{
-	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);
+	keys = sl_malloc( sizeof( struct berval ) * (nkeys+1), ctx );
 
 	slen = syntax->ssyn_oidlen;
 	mlen = mr->smr_oidlen;
 
-	integerNormalize( syntax, assertValue, &norm );
+	nkeys=0;
+	for( i=0; values[i].bv_val != NULL; i++ ) {
+		ber_len_t j,max;
 
-	keys = ch_malloc( sizeof( struct berval ) * 2 );
+		if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
 
-	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 );
+		if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
+			( values[i].bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
+		{
+			char pre = SLAP_INDEX_SUBSTR_PREFIX;
+			max = values[i].bv_len - (SLAP_INDEX_SUBSTR_MAXLEN - 1);
 
-	ber_dupbv( &keys[0], &digest );
-	keys[1].bv_val = NULL;
-	ch_free( norm.bv_val );
+			for( j=0; j<max; j++ ) {
+				HASH_Init( &HASHcontext );
+				if( prefix != NULL && prefix->bv_len > 0 ) {
+					HASH_Update( &HASHcontext,
+						(unsigned char *)prefix->bv_val, prefix->bv_len );
+				}
 
-	*keysp = keys;
-	return LDAP_SUCCESS;
-}
+				HASH_Update( &HASHcontext,
+					(unsigned char *)&pre, sizeof( pre ) );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)syntax->ssyn_oid, slen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)mr->smr_oid, mlen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)&values[i].bv_val[j],
+					SLAP_INDEX_SUBSTR_MAXLEN );
+				HASH_Final( HASHdigest, &HASHcontext );
 
+				ber_dupbv_x( &keys[nkeys++], &digest, ctx );
+			}
+		}
 
-static int
-countryStringValidate(
-	Syntax *syntax,
-	struct berval *val )
-{
-	if( val->bv_len != 2 ) return LDAP_INVALID_SYNTAX;
+		max = SLAP_INDEX_SUBSTR_MAXLEN < values[i].bv_len
+			? SLAP_INDEX_SUBSTR_MAXLEN : values[i].bv_len;
 
-	if( !SLAP_PRINTABLE(val->bv_val[0]) ) {
-		return LDAP_INVALID_SYNTAX;
-	}
-	if( !SLAP_PRINTABLE(val->bv_val[1]) ) {
-		return LDAP_INVALID_SYNTAX;
-	}
+		for( j=SLAP_INDEX_SUBSTR_MINLEN; j<=max; j++ ) {
+			char pre;
 
-	return LDAP_SUCCESS;
-}
+			if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
+				pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
+				HASH_Init( &HASHcontext );
+				if( prefix != NULL && prefix->bv_len > 0 ) {
+					HASH_Update( &HASHcontext,
+						(unsigned char *)prefix->bv_val, prefix->bv_len );
+				}
+				HASH_Update( &HASHcontext,
+					(unsigned char *)&pre, sizeof( pre ) );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)syntax->ssyn_oid, slen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)mr->smr_oid, mlen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)values[i].bv_val, j );
+				HASH_Final( HASHdigest, &HASHcontext );
 
-static int
-printableStringValidate(
-	Syntax *syntax,
-	struct berval *val )
-{
-	ber_len_t i;
+				ber_dupbv_x( &keys[nkeys++], &digest, ctx );
+			}
 
-	if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX;
+			if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
+				pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
+				HASH_Init( &HASHcontext );
+				if( prefix != NULL && prefix->bv_len > 0 ) {
+					HASH_Update( &HASHcontext,
+						(unsigned char *)prefix->bv_val, prefix->bv_len );
+				}
+				HASH_Update( &HASHcontext,
+					(unsigned char *)&pre, sizeof( pre ) );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)syntax->ssyn_oid, slen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)mr->smr_oid, mlen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)&values[i].bv_val[values[i].bv_len-j], j );
+				HASH_Final( HASHdigest, &HASHcontext );
+
+				ber_dupbv_x( &keys[nkeys++], &digest, ctx );
+			}
 
-	for(i=0; i < val->bv_len; i++) {
-		if( !SLAP_PRINTABLE(val->bv_val[i]) ) {
-			return LDAP_INVALID_SYNTAX;
 		}
+
+	}
+
+	if( nkeys > 0 ) {
+		keys[nkeys].bv_val = NULL;
+		*keysp = keys;
+	} else {
+		ch_free( keys );
+		*keysp = NULL;
 	}
 
 	return LDAP_SUCCESS;
 }
 
 static int
-printablesStringValidate(
+octetStringSubstringsFilter (
+	slap_mask_t use,
+	slap_mask_t flags,
 	Syntax *syntax,
-	struct berval *val )
+	MatchingRule *mr,
+	struct berval *prefix,
+	void * assertedValue,
+	BerVarray *keysp,
+	void *ctx)
 {
-	ber_len_t i, len;
+	SubstringsAssertion *sa;
+	char pre;
+	ber_len_t nkeys = 0;
+	size_t slen, mlen, klen;
+	BerVarray keys;
+	HASH_CONTEXT HASHcontext;
+	unsigned char HASHdigest[HASH_BYTES];
+	struct berval *value;
+	struct berval digest;
 
-	if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX;
+	sa = (SubstringsAssertion *) assertedValue;
 
-	for(i=0,len=0; i < val->bv_len; i++) {
-		int c = val->bv_val[i];
+	if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL
+		&& sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+	{
+		nkeys++;
+	}
 
-		if( c == '$' ) {
-			if( len == 0 ) {
-				return LDAP_INVALID_SYNTAX;
+	if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
+		ber_len_t i;
+		for( i=0; sa->sa_any[i].bv_val != 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 );
 			}
-			len = 0;
-
-		} else if ( SLAP_PRINTABLE(c) ) {
-			len++;
-		} else {
-			return LDAP_INVALID_SYNTAX;
 		}
 	}
 
-	if( len == 0 ) LDAP_INVALID_SYNTAX;
-
-	return LDAP_SUCCESS;
-}
+	if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL &&
+		sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+	{
+		nkeys++;
+	}
 
-static int
-IA5StringValidate(
-	Syntax *syntax,
-	struct berval *val )
-{
-	ber_len_t i;
+	if( nkeys == 0 ) {
+		*keysp = NULL;
+		return LDAP_SUCCESS;
+	}
 
-	if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX;
+	digest.bv_val = (char *)HASHdigest;
+	digest.bv_len = sizeof(HASHdigest);
 
-	for(i=0; i < val->bv_len; i++) {
-		if( !LDAP_ASCII(val->bv_val[i]) ) {
-			return LDAP_INVALID_SYNTAX;
-		}
-	}
+	slen = syntax->ssyn_oidlen;
+	mlen = mr->smr_oidlen;
 
-	return LDAP_SUCCESS;
-}
+	keys = sl_malloc( sizeof( struct berval ) * (nkeys+1), ctx );
+	nkeys = 0;
 
-static int
-IA5StringNormalize(
-	Syntax *syntax,
-	struct berval *val,
-	struct berval *normalized )
-{
-	char *p, *q;
+	if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
+		sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+	{
+		pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
+		value = &sa->sa_initial;
 
-	assert( val->bv_len );
+		klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
+			? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
 
-	p = val->bv_val;
+		HASH_Init( &HASHcontext );
+		if( prefix != NULL && prefix->bv_len > 0 ) {
+			HASH_Update( &HASHcontext,
+				(unsigned char *)prefix->bv_val, prefix->bv_len );
+		}
+		HASH_Update( &HASHcontext,
+			(unsigned char *)&pre, sizeof( pre ) );
+		HASH_Update( &HASHcontext,
+			(unsigned char *)syntax->ssyn_oid, slen );
+		HASH_Update( &HASHcontext,
+			(unsigned char *)mr->smr_oid, mlen );
+		HASH_Update( &HASHcontext,
+			(unsigned char *)value->bv_val, klen );
+		HASH_Final( HASHdigest, &HASHcontext );
 
-	/* Ignore initial whitespace */
-	while ( ASCII_SPACE( *p ) ) {
-		p++;
+		ber_dupbv_x( &keys[nkeys++], &digest, ctx );
 	}
 
-	normalized->bv_val = ch_strdup( p );
-	p = q = normalized->bv_val;
+	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;
 
-	while ( *p ) {
-		if ( ASCII_SPACE( *p ) ) {
-			*q++ = *p++;
+		for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
+			if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
+				continue;
+			}
 
-			/* Ignore the extra whitespace */
-			while ( ASCII_SPACE( *p ) ) {
-				p++;
+			value = &sa->sa_any[i];
+
+			for(j=0;
+				j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
+				j += SLAP_INDEX_SUBSTR_STEP )
+			{
+				HASH_Init( &HASHcontext );
+				if( prefix != NULL && prefix->bv_len > 0 ) {
+					HASH_Update( &HASHcontext,
+						(unsigned char *)prefix->bv_val, prefix->bv_len );
+				}
+				HASH_Update( &HASHcontext,
+					(unsigned char *)&pre, sizeof( pre ) );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)syntax->ssyn_oid, slen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)mr->smr_oid, mlen );
+				HASH_Update( &HASHcontext,
+					(unsigned char *)&value->bv_val[j], klen ); 
+				HASH_Final( HASHdigest, &HASHcontext );
+
+				ber_dupbv_x( &keys[nkeys++], &digest, ctx );
 			}
-		} else {
-			*q++ = *p++;
 		}
 	}
 
-	assert( normalized->bv_val <= p );
-	assert( q <= p );
-
-	/*
-	 * If the string ended in space, backup the pointer one
-	 * position.  One is enough because the above loop collapsed
-	 * all whitespace to a single space.
-	 */
+	if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL &&
+		sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
+	{
+		pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
+		value = &sa->sa_final;
 
-	if ( ASCII_SPACE( q[-1] ) ) {
-		--q;
-	}
+		klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
+			? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
 
-	/* null terminate */
-	*q = '\0';
+		HASH_Init( &HASHcontext );
+		if( prefix != NULL && prefix->bv_len > 0 ) {
+			HASH_Update( &HASHcontext,
+				(unsigned char *)prefix->bv_val, prefix->bv_len );
+		}
+		HASH_Update( &HASHcontext,
+			(unsigned char *)&pre, sizeof( pre ) );
+		HASH_Update( &HASHcontext,
+			(unsigned char *)syntax->ssyn_oid, slen );
+		HASH_Update( &HASHcontext,
+			(unsigned char *)mr->smr_oid, mlen );
+		HASH_Update( &HASHcontext,
+			(unsigned char *)&value->bv_val[value->bv_len-klen], klen );
+		HASH_Final( HASHdigest, &HASHcontext );
 
-	normalized->bv_len = q - normalized->bv_val;
+		ber_dupbv_x( &keys[nkeys++], &digest, ctx );
+	}
 
-	if( normalized->bv_len == 0 ) {
-		normalized->bv_val = ch_realloc( normalized->bv_val, 2 );
-		normalized->bv_val[0] = ' ';
-		normalized->bv_val[1] = '\0';
-		normalized->bv_len = 1;
+	if( nkeys > 0 ) {
+		keys[nkeys].bv_val = NULL;
+		*keysp = keys;
+	} else {
+		ch_free( keys );
+		*keysp = NULL;
 	}
 
 	return LDAP_SUCCESS;
 }
 
 static int
-caseExactIA5Match(
-	int *matchp,
-	slap_mask_t flags,
+bitStringValidate(
 	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
+	struct berval *in )
 {
-	int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
+	ber_len_t i;
 
-	if( match == 0 ) {
-		match = strncmp( value->bv_val,
-			((struct berval *) assertedValue)->bv_val,
-			value->bv_len );
+	/* very unforgiving validation, requires no normalization
+	 * before simplistic matching
+	 */
+	if( in->bv_len < 3 ) {
+		return LDAP_INVALID_SYNTAX;
+	}
+
+	/*
+	 * RFC 2252 section 6.3 Bit String
+	 *	bitstring = "'" *binary-digit "'B"
+	 *	binary-digit = "0" / "1"
+	 * example: '0101111101'B
+	 */
+	
+	if( in->bv_val[0] != '\'' ||
+		in->bv_val[in->bv_len-2] != '\'' ||
+		in->bv_val[in->bv_len-1] != 'B' )
+	{
+		return LDAP_INVALID_SYNTAX;
+	}
+
+	for( i=in->bv_len-3; i>0; i-- ) {
+		if( in->bv_val[i] != '0' && in->bv_val[i] != '1' ) {
+			return LDAP_INVALID_SYNTAX;
+		}
 	}
 
-	*matchp = match;
 	return LDAP_SUCCESS;
 }
 
 static int
-caseExactIA5SubstringsMatch(
-	int *matchp,
-	slap_mask_t flags,
+nameUIDValidate(
 	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
+	struct berval *in )
 {
-	int match = 0;
-	SubstringsAssertion *sub = assertedValue;
-	struct berval left = *value;
-	int i;
-	ber_len_t inlen=0;
-
-	/* Add up asserted input length */
-	if( sub->sa_initial.bv_val ) {
-		inlen += sub->sa_initial.bv_len;
-	}
-	if( sub->sa_any ) {
-		for(i=0; sub->sa_any[i].bv_val != NULL; i++) {
-			inlen += sub->sa_any[i].bv_len;
-		}
-	}
-	if( sub->sa_final.bv_val ) {
-		inlen += sub->sa_final.bv_len;
-	}
-
-	if( sub->sa_initial.bv_val ) {
-		if( inlen > left.bv_len ) {
-			match = 1;
-			goto done;
-		}
+	int rc;
+	struct berval dn;
 
-		match = strncmp( sub->sa_initial.bv_val, left.bv_val,
-			sub->sa_initial.bv_len );
+	if( in->bv_len == 0 ) return LDAP_SUCCESS;
 
-		if( match != 0 ) {
-			goto done;
-		}
+	ber_dupbv( &dn, in );
+	if( !dn.bv_val ) return LDAP_OTHER;
 
-		left.bv_val += sub->sa_initial.bv_len;
-		left.bv_len -= sub->sa_initial.bv_len;
-		inlen -= sub->sa_initial.bv_len;
-	}
+	if( dn.bv_val[dn.bv_len-1] == 'B'
+		&& dn.bv_val[dn.bv_len-2] == '\'' )
+	{
+		/* assume presence of optional UID */
+		ber_len_t i;
 
-	if( sub->sa_final.bv_val ) {
-		if( inlen > left.bv_len ) {
-			match = 1;
-			goto done;
+		for(i=dn.bv_len-3; i>1; i--) {
+			if( dn.bv_val[i] != '0' && dn.bv_val[i] != '1' ) {
+				break;
+			}
 		}
-
-		match = strncmp( sub->sa_final.bv_val,
-			&left.bv_val[left.bv_len - sub->sa_final.bv_len],
-			sub->sa_final.bv_len );
-
-		if( match != 0 ) {
-			goto done;
+		if( dn.bv_val[i] != '\'' || dn.bv_val[i-1] != '#' ) {
+			ber_memfree( dn.bv_val );
+			return LDAP_INVALID_SYNTAX;
 		}
 
-		left.bv_len -= sub->sa_final.bv_len;
-		inlen -= sub->sa_final.bv_len;
+		/* trim the UID to allow use of dnValidate */
+		dn.bv_val[i-1] = '\0';
+		dn.bv_len = i-1;
 	}
 
-	if( sub->sa_any ) {
-		for(i=0; sub->sa_any[i].bv_val; i++) {
-			ber_len_t idx;
-			char *p;
-
-retry:
-			if( inlen > left.bv_len ) {
-				/* not enough length */
-				match = 1;
-				goto done;
-			}
+	rc = dnValidate( NULL, &dn );
 
-			if( sub->sa_any[i].bv_len == 0 ) {
-				continue;
-			}
+	ber_memfree( dn.bv_val );
+	return rc;
+}
 
-			p = strchr( left.bv_val, *sub->sa_any[i].bv_val );
+int
+nameUIDPretty(
+	Syntax *syntax,
+	struct berval *val,
+	struct berval *out,
+	void *ctx )
+{
+	assert( val );
+	assert( out );
 
-			if( p == NULL ) {
-				match = 1;
-				goto done;
-			}
 
-			idx = p - left.bv_val;
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, ">>> nameUIDPretty: <%s>\n", val->bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, ">>> nameUIDPretty: <%s>\n", val->bv_val, 0, 0 );
+#endif
 
-			if( idx >= left.bv_len ) {
-				/* this shouldn't happen */
-				return LDAP_OTHER;
-			}
+	if( val->bv_len == 0 ) {
+		ber_dupbv_x( out, val, ctx );
 
-			left.bv_val = p;
-			left.bv_len -= idx;
+	} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		return LDAP_INVALID_SYNTAX;
 
-			if( sub->sa_any[i].bv_len > left.bv_len ) {
-				/* not enough left */
-				match = 1;
-				goto done;
+	} else {
+		int rc;
+		struct berval dnval = *val;
+		struct berval uidval = { 0, NULL };
+
+		if( val->bv_val[val->bv_len-1] == 'B'
+			&& val->bv_val[val->bv_len-2] == '\'' )
+		{
+			uidval.bv_val=strrchr( val->bv_val, '#' );
+			if( uidval.bv_val ) {
+				dnval.bv_len = uidval.bv_val - dnval.bv_val;
+				uidval.bv_len = val->bv_len - dnval.bv_len;
+
+				uidval.bv_len--;
+				uidval.bv_val++;
 			}
+		}
 
-			match = strncmp( left.bv_val,
-				sub->sa_any[i].bv_val,
-				sub->sa_any[i].bv_len );
+		rc = dnPretty( syntax, &dnval, out, ctx );
+		if( rc != LDAP_SUCCESS ) return rc;
 
-			if( match != 0 ) {
-				left.bv_val++;
-				left.bv_len--;
-				goto retry;
+		if( uidval.bv_val ) {
+			char *tmp = sl_realloc( out->bv_val, out->bv_len + uidval.bv_len + 2, ctx );
+			int i, c, got1;
+			if( tmp == NULL ) {
+				ber_memfree_x( out->bv_val, ctx );
+				return LDAP_OTHER;
+			}
+			out->bv_val = tmp;
+			out->bv_val[out->bv_len++] = '#';
+
+			got1 = uidval.bv_len < sizeof("'0'B"); 
+			for(i=0; i<uidval.bv_len; i++) {
+				c = uidval.bv_val[i];
+				switch(c) {
+					case '0':
+						if( got1 ) out->bv_val[out->bv_len++] = c;
+						break;
+					case '1':
+						got1 = 1;
+					default:
+						out->bv_val[out->bv_len++] = c;
+				}
 			}
 
-			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;
+			out->bv_val[out->bv_len] = '\0';
 		}
 	}
 
-done:
-	*matchp = match;
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, "<<< nameUIDPretty: <%s>\n", out->bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "<<< nameUIDPretty: <%s>\n", out->bv_val, 0, 0 );
+#endif
+
 	return LDAP_SUCCESS;
 }
 
-/* Index generation function */
-static int caseExactIA5Indexer(
-	slap_mask_t use,
-	slap_mask_t flags,
+static int
+uniqueMemberNormalize(
+	slap_mask_t usage,
 	Syntax *syntax,
 	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
+	struct berval *val,
+	struct berval *normalized,
+	void *ctx )
 {
-	int i;
-	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);
+	struct berval out;
+	int rc;
 
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* empty - just count them */
-	}
+	assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ));
 
-	/* we should have at least one value at this point */
-	assert( i > 0 );
+	ber_dupbv( &out, val );
+	if( out.bv_len != 0 ) {
+		struct berval uid = { 0, NULL };
 
-	keys = ch_malloc( sizeof( struct berval ) * (i+1) );
+		if( out.bv_val[out.bv_len-1] == 'B'
+			&& out.bv_val[out.bv_len-2] == '\'' )
+		{
+			/* assume presence of optional UID */
+			uid.bv_val = strrchr( out.bv_val, '#' );
 
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+			if( uid.bv_val == NULL ) {
+				free( out.bv_val );
+				return LDAP_INVALID_SYNTAX;
+			}
 
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		struct berval *value = &values[i];
+			uid.bv_len = out.bv_len - (uid.bv_val - out.bv_val);
+			out.bv_len -= uid.bv_len--;
 
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
+			/* temporarily trim the UID */
+			*(uid.bv_val++) = '\0';
 		}
-		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			value->bv_val, value->bv_len );
-		HASH_Final( HASHdigest, &HASHcontext );
 
-		ber_dupbv( &keys[i], &digest );
-	}
+		rc = dnNormalize( 0, NULL, NULL, &out, normalized, ctx );
 
-	keys[i].bv_val = NULL;
-	*keysp = keys;
-	return LDAP_SUCCESS;
-}
+		if( rc != LDAP_SUCCESS ) {
+			free( out.bv_val );
+			return LDAP_INVALID_SYNTAX;
+		}
 
-/* Index generation function */
-static int caseExactIA5Filter(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
-{
-	size_t slen, mlen;
-	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval *value;
-	struct berval digest;
-	digest.bv_val = HASHdigest;
-	digest.bv_len = sizeof(HASHdigest);
+		if( uid.bv_len ) {
+			normalized->bv_val = ch_realloc( normalized->bv_val,
+				normalized->bv_len + uid.bv_len + sizeof("#") );
 
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+			/* insert the separator */
+			normalized->bv_val[normalized->bv_len++] = '#';
 
-	value = (struct berval *) assertValue;
+			/* append the UID */
+			AC_MEMCPY( &normalized->bv_val[normalized->bv_len],
+				uid.bv_val, uid.bv_len );
+			normalized->bv_len += uid.bv_len;
 
-	keys = ch_malloc( sizeof( struct berval ) * 2 );
+			/* terminate */
+			normalized->bv_val[normalized->bv_len] = '\0';
+		}
 
-	HASH_Init( &HASHcontext );
-	if( prefix != NULL && prefix->bv_len > 0 ) {
-		HASH_Update( &HASHcontext,
-			prefix->bv_val, prefix->bv_len );
+		free( out.bv_val );
 	}
-	HASH_Update( &HASHcontext,
-		syntax->ssyn_oid, slen );
-	HASH_Update( &HASHcontext,
-		mr->smr_oid, mlen );
-	HASH_Update( &HASHcontext,
-		value->bv_val, value->bv_len );
-	HASH_Final( HASHdigest, &HASHcontext );
-
-	ber_dupbv( &keys[0], &digest );
-	keys[1].bv_val = NULL;
 
-	*keysp = keys;
 	return LDAP_SUCCESS;
 }
 
-/* Substrings Index generation function */
-static int caseExactIA5SubstringsIndexer(
-	slap_mask_t use,
+static int
+uniqueMemberMatch(
+	int *matchp,
 	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
+	struct berval *value,
+	void *assertedValue )
 {
-	ber_len_t i, nkeys;
-	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);
+	int match;
+	struct berval *asserted = (struct berval *) assertedValue;
+	struct berval assertedDN = { 0, NULL };
+	struct berval assertedUID = { 0, NULL };
+	struct berval valueDN = { 0, NULL };
+	struct berval valueUID = { 0, NULL };
 
-	/* we should have at least one value at this point */
-	assert( values != NULL && values[0].bv_val != NULL );
+	if( asserted->bv_len != 0 ) {
+		assertedDN = *asserted;
 
-	nkeys=0;
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* count number of indices to generate */
-		if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
-			continue;
-		}
+		if( assertedDN.bv_val[assertedDN.bv_len-1] == 'B'
+			&& assertedDN.bv_val[assertedDN.bv_len-2] == '\'' )
+		{
+			/* assume presence of optional UID */
+			assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' );
 
-		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( assertedUID.bv_val == NULL ) {
+				return LDAP_INVALID_SYNTAX;
 			}
-		}
 
-		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 );
-			}
-		}
+			assertedUID.bv_len = assertedDN.bv_len -
+				(assertedUID.bv_val - assertedDN.bv_val);
+			assertedDN.bv_len -= assertedUID.bv_len--;
 
-		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 );
-			}
+			/* trim the separator */
+			assertedUID.bv_val++;
 		}
 	}
 
-	if( nkeys == 0 ) {
-		/* no keys to generate */
-		*keysp = NULL;
-		return LDAP_SUCCESS;
-	}
-
-	keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
-
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
-
-	nkeys=0;
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		ber_len_t j,max;
-		struct berval *value;
-
-		value = &values[i];
-		if( value->bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
+	if( value->bv_len != 0 ) {
+		valueDN = *value;
 
-		if( ( flags & SLAP_INDEX_SUBSTR_ANY ) &&
-			( value->bv_len >= SLAP_INDEX_SUBSTR_MAXLEN ) )
+		if( valueDN.bv_val[valueDN.bv_len-1] == 'B'
+			&& valueDN.bv_val[valueDN.bv_len-2] == '\'' )
 		{
-			char pre = SLAP_INDEX_SUBSTR_PREFIX;
-			max = value->bv_len - ( SLAP_INDEX_SUBSTR_MAXLEN - 1);
-
-			for( j=0; j<max; j++ ) {
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&value->bv_val[j],
-					SLAP_INDEX_SUBSTR_MAXLEN );
-				HASH_Final( HASHdigest, &HASHcontext );
+			/* assume presence of optional UID */
+			valueUID.bv_val = strrchr( valueDN.bv_val, '#' );
 
-				ber_dupbv( &keys[nkeys++], &digest );
+			if( valueUID.bv_val == NULL ) {
+				return LDAP_INVALID_SYNTAX;
 			}
-		}
-
-		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;
+			valueUID.bv_len = valueDN.bv_len -
+				(assertedUID.bv_val - assertedDN.bv_val);
+			valueDN.bv_len -= valueUID.bv_len--;
 
-			if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
-				pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					value->bv_val, j );
-				HASH_Final( HASHdigest, &HASHcontext );
+			/* trim the separator */
+			valueUID.bv_val++;
+		}
+	}
 
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
+	if( valueUID.bv_len && assertedUID.bv_len ) {
+		match = memcmp( valueUID.bv_val, assertedUID.bv_val, valueUID.bv_len );
+		if( match ) {
+			*matchp = match;
+			return LDAP_SUCCESS;
+		}
+	}
 
-			if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
-				pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&value->bv_val[value->bv_len-j], j );
-				HASH_Final( HASHdigest, &HASHcontext );
+	return dnMatch( matchp, flags, syntax, mr, &valueDN, &assertedDN );
+}
 
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
+/*
+ * Handling boolean syntax and matching is quite rigid.
+ * A more flexible approach would be to allow a variety
+ * of strings to be normalized and prettied into TRUE
+ * and FALSE.
+ */
+static int
+booleanValidate(
+	Syntax *syntax,
+	struct berval *in )
+{
+	/* very unforgiving validation, requires no normalization
+	 * before simplistic matching
+	 */
 
+	if( in->bv_len == 4 ) {
+		if( bvmatch( in, &slap_true_bv ) ) {
+			return LDAP_SUCCESS;
+		}
+	} else if( in->bv_len == 5 ) {
+		if( bvmatch( in, &slap_false_bv ) ) {
+			return LDAP_SUCCESS;
 		}
 	}
 
-	if( nkeys > 0 ) {
-		keys[nkeys].bv_val = NULL;
-		*keysp = keys;
-	} else {
-		ch_free( keys );
-		*keysp = NULL;
-	}
-
-	return LDAP_SUCCESS;
+	return LDAP_INVALID_SYNTAX;
 }
 
-static int caseExactIA5SubstringsFilter(
-	slap_mask_t use,
+static int
+booleanMatch(
+	int *matchp,
 	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
+	struct berval *value,
+	void *assertedValue )
 {
-	SubstringsAssertion *sa = assertValue;
-	char pre;
-	ber_len_t nkeys = 0;
-	size_t slen, mlen, klen;
-	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval *value;
-	struct berval digest;
+	/* simplistic matching allowed by rigid validation */
+	struct berval *asserted = (struct berval *) assertedValue;
+	*matchp = value->bv_len != asserted->bv_len;
+	return LDAP_SUCCESS;
+}
+
+/*-------------------------------------------------------------------
+LDAP/X.500 string syntax / matching rules have a few oddities.  This
+comment attempts to detail how slapd(8) treats them.
 
-	if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
-		sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		nkeys++;
-	}
+Summary:
+  StringSyntax		X.500	LDAP	Matching/Comments
+  DirectoryString	CHOICE	UTF8	i/e + ignore insignificant spaces
+  PrintableString	subset	subset	i/e + ignore insignificant spaces
+  PrintableString	subset	subset	i/e + ignore insignificant spaces
+  NumericString		subset	subset	ignore all spaces
+  IA5String			ASCII	ASCII	i/e + ignore insignificant spaces
+  TeletexString		T.61	T.61	i/e + ignore insignificant spaces
 
-	if( flags & SLAP_INDEX_SUBSTR_ANY && sa->sa_any != NULL ) {
-		ber_len_t i;
-		for( i=0; sa->sa_any[i].bv_val != 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 );
-			}
-		}
-	}
+  TelephoneNumber	subset	subset	i + ignore all spaces and "-"
 
-	if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != NULL &&
-		sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		nkeys++;
-	}
+  See draft-ietf-ldapbis-strpro for details (once published).
 
-	if( nkeys == 0 ) {
-		*keysp = NULL;
-		return LDAP_SUCCESS;
-	}
 
-	digest.bv_val = HASHdigest;
-	digest.bv_len = sizeof(HASHdigest);
+Directory String -
+  In X.500(93), a directory string can be either a PrintableString,
+  a bmpString, or a UniversalString (e.g., UCS (a subset of Unicode)).
+  In later versions, more CHOICEs were added.  In all cases the string
+  must be non-empty.
 
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+  In LDAPv3, a directory string is a UTF-8 encoded UCS string.
+  A directory string cannot be zero length.
 
-	keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
-	nkeys = 0;
+  For matching, there are both case ignore and exact rules.  Both
+  also require that "insignificant" spaces be ignored.
+	spaces before the first non-space are ignored;
+	spaces after the last non-space are ignored;
+	spaces after a space are ignored.
+  Note: by these rules (and as clarified in X.520), a string of only
+  spaces is to be treated as if held one space, not empty (which
+  would be a syntax error).
 
-	if( flags & SLAP_INDEX_SUBSTR_INITIAL && sa->sa_initial.bv_val != NULL &&
-		sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
-		value = &sa->sa_initial;
+NumericString
+  In ASN.1, numeric string is just a string of digits and spaces
+  and could be empty.  However, in X.500, all attribute values of
+  numeric string carry a non-empty constraint.  For example:
 
-		klen = SLAP_INDEX_SUBSTR_MAXLEN < value->bv_len
-			? SLAP_INDEX_SUBSTR_MAXLEN : value->bv_len;
+	internationalISDNNumber ATTRIBUTE ::= {
+		WITH SYNTAX InternationalISDNNumber
+		EQUALITY MATCHING RULE numericStringMatch
+		SUBSTRINGS MATCHING RULE numericStringSubstringsMatch
+		ID id-at-internationalISDNNumber }
+	InternationalISDNNumber ::=
+	    NumericString (SIZE(1..ub-international-isdn-number))
 
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
-		}
-		HASH_Update( &HASHcontext,
-			&pre, sizeof( pre ) );
-		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			value->bv_val, klen );
-		HASH_Final( HASHdigest, &HASHcontext );
+  Unforunately, some assertion values are don't carry the same
+  constraint (but its unclear how such an assertion could ever
+  be true). In LDAP, there is one syntax (numericString) not two
+  (numericString with constraint, numericString without constraint).
+  This should be treated as numericString with non-empty constraint.
+  Note that while someone may have no ISDN number, there are no ISDN
+  numbers which are zero length.
 
-		ber_dupbv( &keys[nkeys++], &digest );
-	}
+  In matching, spaces are ignored.
 
-	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;
+PrintableString
+  In ASN.1, Printable string is just a string of printable characters
+  and can be empty.  In X.500, semantics much like NumericString (see
+  serialNumber for a like example) excepting uses insignificant space
+  handling instead of ignore all spaces.  
 
-		for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
-			if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
-				continue;
-			}
+IA5String
+  Basically same as PrintableString.  There are no examples in X.500,
+  but same logic applies.  So we require them to be non-empty as
+  well.
 
-			value = &sa->sa_any[i];
+-------------------------------------------------------------------*/
 
-			for(j=0;
-				j <= value->bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
-				j += SLAP_INDEX_SUBSTR_STEP )
-			{
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&value->bv_val[j], klen ); 
-				HASH_Final( HASHdigest, &HASHcontext );
+static int
+UTF8StringValidate(
+	Syntax *syntax,
+	struct berval *in )
+{
+	ber_len_t count;
+	int len;
+	unsigned char *u = (unsigned char *)in->bv_val;
 
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
-		}
+	if( in->bv_len == 0 && syntax == slap_schema.si_syn_directoryString ) {
+		/* directory strings cannot be empty */
+		return LDAP_INVALID_SYNTAX;
 	}
 
-	if( flags & SLAP_INDEX_SUBSTR_FINAL && sa->sa_final.bv_val != 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;
+	for( count = in->bv_len; count > 0; count-=len, u+=len ) {
+		/* get the length indicated by the first byte */
+		len = LDAP_UTF8_CHARLEN2( u, len );
 
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
+		/* 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;
 		}
-		HASH_Update( &HASHcontext,
-			&pre, sizeof( pre ) );
-		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			&value->bv_val[value->bv_len-klen], klen );
-		HASH_Final( HASHdigest, &HASHcontext );
 
-		ber_dupbv( &keys[nkeys++], &digest );
+		/* make sure len corresponds with the offset
+			to the next character */
+		if( LDAP_UTF8_OFFSET( (char *)u ) != len ) return LDAP_INVALID_SYNTAX;
 	}
 
-	if( nkeys > 0 ) {
-		keys[nkeys].bv_val = NULL;
-		*keysp = keys;
-	} else {
-		ch_free( keys );
-		*keysp = NULL;
+	if( count != 0 ) {
+		return LDAP_INVALID_SYNTAX;
 	}
 
 	return LDAP_SUCCESS;
 }
-	
+
 static int
-caseIgnoreIA5Match(
-	int *matchp,
-	slap_mask_t flags,
+UTF8StringNormalize(
+	slap_mask_t use,
 	Syntax *syntax,
 	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
+	struct berval *val,
+	struct berval *normalized,
+	void *ctx )
 {
-	int match = value->bv_len - ((struct berval *) assertedValue)->bv_len;
+	struct berval tmp, nvalue;
+	int flags;
+	int i, wasspace;
 
-	if( match == 0 && value->bv_len ) {
-		match = strncasecmp( value->bv_val,
-			((struct berval *) assertedValue)->bv_val,
-			value->bv_len );
+	assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ));
+
+	if( val->bv_val == NULL ) {
+		/* assume we're dealing with a syntax (e.g., UTF8String)
+		 * which allows empty strings
+		 */
+		normalized->bv_len = 0;
+		normalized->bv_val = NULL;
+		return LDAP_SUCCESS;
 	}
 
-	*matchp = match;
+	flags = SLAP_MR_ASSOCIATED( mr, slap_schema.si_mr_caseExactMatch )
+		? LDAP_UTF8_NOCASEFOLD : LDAP_UTF8_CASEFOLD;
+	flags |= ( ( use & SLAP_MR_EQUALITY_APPROX ) == SLAP_MR_EQUALITY_APPROX )
+		? LDAP_UTF8_APPROX : 0;
+
+	val = UTF8bvnormalize( val, &tmp, flags, ctx );
+	if( val == NULL ) {
+		return LDAP_OTHER;
+	}
+	
+	/* collapse spaces (in place) */
+	nvalue.bv_len = 0;
+	nvalue.bv_val = tmp.bv_val;
+
+	wasspace=1; /* trim leading spaces */
+	for( i=0; i<tmp.bv_len; i++) {
+		if ( ASCII_SPACE( tmp.bv_val[i] )) {
+			if( wasspace++ == 0 ) {
+				/* trim repeated spaces */
+				nvalue.bv_val[nvalue.bv_len++] = tmp.bv_val[i];
+			}
+		} else {
+			wasspace = 0;
+			nvalue.bv_val[nvalue.bv_len++] = tmp.bv_val[i];
+		}
+	}
+
+	if( nvalue.bv_len ) {
+		if( wasspace ) {
+			/* last character was a space, trim it */
+			--nvalue.bv_len;
+		}
+		nvalue.bv_val[nvalue.bv_len] = '\0';
+
+	} else {
+		/* string of all spaces is treated as one space */
+		nvalue.bv_val[0] = ' ';
+		nvalue.bv_val[1] = '\0';
+		nvalue.bv_len = 1;
+	}
+
+	*normalized = nvalue;
 	return LDAP_SUCCESS;
 }
 
+#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
-caseIgnoreIA5SubstringsMatch(
+approxMatch(
 	int *matchp,
 	slap_mask_t flags,
 	Syntax *syntax,
@@ -2794,578 +1255,611 @@ caseIgnoreIA5SubstringsMatch(
 	struct berval *value,
 	void *assertedValue )
 {
-	int match = 0;
-	SubstringsAssertion *sub = assertedValue;
-	struct berval left = *value;
-	int i;
-	ber_len_t inlen=0;
+	struct berval *nval, *assertv;
+	char *val, **values, **words, *c;
+	int i, count, len, nextchunk=0, nextavail=0;
 
-	/* Add up asserted input length */
-	if( sub->sa_initial.bv_val ) {
-		inlen += sub->sa_initial.bv_len;
-	}
-	if( sub->sa_any ) {
-		for(i=0; sub->sa_any[i].bv_val != NULL; i++) {
-			inlen += sub->sa_any[i].bv_len;
-		}
+	/* Yes, this is necessary */
+	nval = UTF8bvnormalize( value, NULL, LDAP_UTF8_APPROX, NULL );
+	if( nval == NULL ) {
+		*matchp = 1;
+		return LDAP_SUCCESS;
 	}
-	if( sub->sa_final.bv_val ) {
-		inlen += sub->sa_final.bv_len;
+
+	/* Yes, this is necessary */
+	assertv = UTF8bvnormalize( ((struct berval *)assertedValue),
+		NULL, LDAP_UTF8_APPROX, NULL );
+	if( assertv == NULL ) {
+		ber_bvfree( nval );
+		*matchp = 1;
+		return LDAP_SUCCESS;
 	}
 
-	if( sub->sa_initial.bv_val ) {
-		if( inlen > left.bv_len ) {
-			match = 1;
-			goto done;
-		}
+	/* Isolate how many words there are */
+	for ( c = nval->bv_val, count = 1; *c; c++ ) {
+		c = strpbrk( c, SLAPD_APPROX_DELIMITER );
+		if ( c == NULL ) break;
+		*c = '\0';
+		count++;
+	}
 
-		match = strncasecmp( sub->sa_initial.bv_val, left.bv_val,
-			sub->sa_initial.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 = nval->bv_val, i = 0;  i < count; i++, c += strlen(c) + 1 ) {
+		words[i] = c;
+		values[i] = phonetic(c);
+	}
 
-		if( match != 0 ) {
-			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 ( (ber_len_t) nextchunk < assertv->bv_len ) {
+		len = strcspn( assertv->bv_val + 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->bv_val + nextchunk, words[i], 1 )) {
+					nextavail=i+1;
+					break;
+				}
 		}
+#endif
+		else {
+			/* Isolate the next word in the asserted value and phonetic it */
+			assertv->bv_val[nextchunk+len] = '\0';
+			val = phonetic( assertv->bv_val + nextchunk );
 
-		left.bv_val += sub->sa_initial.bv_len;
-		left.bv_len -= sub->sa_initial.bv_len;
-		inlen -= sub->sa_initial.bv_len;
-	}
-
-	if( sub->sa_final.bv_val ) {
-		if( inlen > left.bv_len ) {
-			match = 1;
-			goto done;
+			/* 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;
+				}
+			}
+			ch_free( val );
 		}
 
-		match = strncasecmp( sub->sa_final.bv_val,
-			&left.bv_val[left.bv_len - sub->sa_final.bv_len],
-			sub->sa_final.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_len -= sub->sa_final.bv_len;
-		inlen -= sub->sa_final.bv_len;
+		/* Go on to the next word in the asserted value */
+		nextchunk += len+1;
 	}
 
-	if( sub->sa_any ) {
-		for(i=0; sub->sa_any[i].bv_val; i++) {
-			ber_len_t idx;
-			char *p;
-
-retry:
-			if( inlen > left.bv_len ) {
-				/* not enough length */
-				match = 1;
-				goto done;
-			}
-
-			if( sub->sa_any[i].bv_len == 0 ) {
-				continue;
-			}
-
-			p = bvcasechr( &left, *sub->sa_any[i].bv_val, &idx );
-
-			if( p == NULL ) {
-				match = 1;
-				goto done;
-			}
+	/* If some of the words were seen, call it a match */
+	if( nextavail > 0 ) {
+		*matchp = 0;
+	}
+	else {
+		*matchp = 1;
+	}
 
-			assert( idx < left.bv_len );
-			if( idx >= left.bv_len ) {
-				/* this shouldn't happen */
-				return LDAP_OTHER;
-			}
+	/* Cleanup allocs */
+	ber_bvfree( assertv );
+	for( i=0; i<count; i++ ) {
+		ch_free( values[i] );
+	}
+	ch_free( values );
+	ch_free( words );
+	ber_bvfree( nval );
 
-			left.bv_val = p;
-			left.bv_len -= idx;
+	return LDAP_SUCCESS;
+}
 
-			if( sub->sa_any[i].bv_len > left.bv_len ) {
-				/* not enough left */
-				match = 1;
-				goto done;
-			}
+static int 
+approxIndexer(
+	slap_mask_t use,
+	slap_mask_t flags,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *prefix,
+	BerVarray values,
+	BerVarray *keysp,
+	void *ctx )
+{
+	char *c;
+	int i,j, len, wordcount, keycount=0;
+	struct berval *newkeys;
+	BerVarray keys=NULL;
 
-			match = strncasecmp( left.bv_val,
-				sub->sa_any[i].bv_val,
-				sub->sa_any[i].bv_len );
+	for( j=0; values[j].bv_val != NULL; j++ ) {
+		struct berval val = { 0, NULL };
+		/* Yes, this is necessary */
+		UTF8bvnormalize( &values[j], &val, LDAP_UTF8_APPROX, NULL );
+		assert( val.bv_val != NULL );
 
-			if( match != 0 ) {
-				left.bv_val++;
-				left.bv_len--;
+		/* Isolate how many words there are. There will be a key for each */
+		for( wordcount = 0, c = val.bv_val; *c; c++) {
+			len = strcspn(c, SLAPD_APPROX_DELIMITER);
+			if( len >= SLAPD_APPROX_WORDLEN ) wordcount++;
+			c+= len;
+			if (*c == '\0') break;
+			*c = '\0';
+		}
 
-				goto retry;
-			}
+		/* Allocate/increase storage to account for new keys */
+		newkeys = (struct berval *)ch_malloc( (keycount + wordcount + 1) 
+			* sizeof(struct berval) );
+		AC_MEMCPY( newkeys, keys, keycount * sizeof(struct berval) );
+		if( keys ) ch_free( keys );
+		keys = newkeys;
 
-			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;
+		/* Get a phonetic copy of each word */
+		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] );
+			keycount++;
+			i++;
 		}
+
+		ber_memfree( val.bv_val );
 	}
+	keys[keycount].bv_val = NULL;
+	*keysp = keys;
 
-done:
-	*matchp = match;
 	return LDAP_SUCCESS;
 }
 
-/* Index generation function */
-static int caseIgnoreIA5Indexer(
+static int 
+approxFilter(
 	slap_mask_t use,
 	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
 	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
+	void * assertedValue,
+	BerVarray *keysp,
+	void *ctx )
 {
-	int i;
-	int rc = LDAP_SUCCESS;
-	size_t slen, mlen;
+	char *c;
+	int i, count, len;
+	struct berval *val;
 	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval digest;
-	digest.bv_val = HASHdigest;
-	digest.bv_len = sizeof(HASHdigest);
 
-	/* we should have at least one value at this point */
-	assert( values != NULL && values[0].bv_val != NULL );
+	/* Yes, this is necessary */
+	val = UTF8bvnormalize( ((struct berval *)assertedValue),
+		NULL, LDAP_UTF8_APPROX, NULL );
+	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;
+	}
 
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* just count them */
+	/* Isolate how many words there are. There will be a key for each */
+	for( count = 0,c = val->bv_val; *c; c++) {
+		len = strcspn(c, SLAPD_APPROX_DELIMITER);
+		if( len >= SLAPD_APPROX_WORDLEN ) count++;
+		c+= len;
+		if (*c == '\0') break;
+		*c = '\0';
 	}
 
-	keys = ch_malloc( sizeof( struct berval ) * (i+1) );
+	/* Allocate storage for new keys */
+	keys = (struct berval *)ch_malloc( (count + 1) * sizeof(struct berval) );
 
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+	/* Get a phonetic copy of each word */
+	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++;
+	}
 
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		struct berval value;
+	ber_bvfree( val );
 
-		if( mr->smr_normalize ) {
-			rc = (mr->smr_normalize)( use, syntax, mr, &values[i], &value );
-			if( rc != LDAP_SUCCESS ) {
-				break;
-			}
-		} else if ( mr->smr_syntax->ssyn_normalize ) {
-			rc = (mr->smr_syntax->ssyn_normalize)( syntax, &values[i], &value );
-			if( rc != LDAP_SUCCESS ) {
-				break;
-			}
-		} else {
-			ber_dupbv( &value, &values[i] );
-		}
+	keys[count].bv_val = NULL;
+	*keysp = keys;
+
+	return LDAP_SUCCESS;
+}
 
-		ldap_pvt_str2lower( value.bv_val );
+/* Remove all spaces and '-' characters */
+static int
+telephoneNumberNormalize(
+	slap_mask_t usage,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *val,
+	struct berval *normalized,
+	void *ctx )
+{
+	char *p, *q;
 
-		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,
-			value.bv_val, value.bv_len );
-		HASH_Final( HASHdigest, &HASHcontext );
+	assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ));
+
+	/* validator should have refused an empty string */
+	assert( val->bv_len );
 
-		free( value.bv_val );
+	q = normalized->bv_val = sl_malloc( val->bv_len + 1, ctx );
 
-		ber_dupbv( &keys[i], &digest );
+	for( p = val->bv_val; *p; p++ ) {
+		if ( ! ( ASCII_SPACE( *p ) || *p == '-' )) {
+			*q++ = *p;
+		}
 	}
+	*q = '\0';
 
-	keys[i].bv_val = NULL;
-	if( rc != LDAP_SUCCESS ) {
-		ber_bvarray_free( keys );
-		keys = NULL;
+	normalized->bv_len = q - normalized->bv_val;
+
+	if( normalized->bv_len == 0 ) {
+		sl_free( normalized->bv_val, ctx );
+		normalized->bv_val = NULL;
+		return LDAP_INVALID_SYNTAX;
 	}
-	*keysp = keys;
-	return rc;
+
+	return LDAP_SUCCESS;
 }
 
-/* Index generation function */
-static int caseIgnoreIA5Filter(
-	slap_mask_t use,
-	slap_mask_t flags,
+static int
+numericoidValidate(
 	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
+	struct berval *in )
 {
-	size_t slen, mlen;
-	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval value;
-	struct berval digest;
-	digest.bv_val = HASHdigest;
-	digest.bv_len = sizeof(HASHdigest);
+	struct berval val = *in;
 
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+	if( val.bv_len == 0 ) {
+		/* disallow empty strings */
+		return LDAP_INVALID_SYNTAX;
+	}
 
-	ber_dupbv( &value, (struct berval *) assertValue );
-	ldap_pvt_str2lower( value.bv_val );
+	while( OID_LEADCHAR( val.bv_val[0] ) ) {
+		if ( val.bv_len == 1 ) {
+			return LDAP_SUCCESS;
+		}
 
-	keys = ch_malloc( sizeof( struct berval ) * 2 );
+		if ( val.bv_val[0] == '0' ) {
+			break;
+		}
 
-	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,
-		value.bv_val, value.bv_len );
-	HASH_Final( HASHdigest, &HASHcontext );
+		val.bv_val++;
+		val.bv_len--;
+
+		while ( OID_LEADCHAR( val.bv_val[0] )) {
+			val.bv_val++;
+			val.bv_len--;
 
-	ber_dupbv( &keys[0], &digest );
-	keys[1].bv_val = NULL;
+			if ( val.bv_len == 0 ) {
+				return LDAP_SUCCESS;
+			}
+		}
 
-	free( value.bv_val );
+		if( !OID_SEPARATOR( val.bv_val[0] )) {
+			break;
+		}
 
-	*keysp = keys;
+		val.bv_val++;
+		val.bv_len--;
+	}
 
-	return LDAP_SUCCESS;
+	return LDAP_INVALID_SYNTAX;
 }
 
-/* Substrings Index generation function */
-static int caseIgnoreIA5SubstringsIndexer(
-	slap_mask_t use,
-	slap_mask_t flags,
+static int
+integerValidate(
 	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
+	struct berval *in )
 {
-	ber_len_t i, nkeys;
-	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);
+	ber_len_t i;
+	struct berval val = *in;
 
-	/* we should have at least one value at this point */
-	assert( values != NULL && values[0].bv_val != NULL );
+	if( val.bv_len == 0 ) return LDAP_INVALID_SYNTAX;
 
-	nkeys=0;
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* count number of indices to generate */
-		if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) {
-			continue;
+	if ( val.bv_val[0] == '-' ) {
+		val.bv_len--;
+		val.bv_val++;
+
+		if( val.bv_len == 0 ) { /* bare "-" */
+			return LDAP_INVALID_SYNTAX;
 		}
 
-		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( val.bv_val[0] == '0' ) { /* "-0" */
+			return LDAP_INVALID_SYNTAX;
 		}
 
-		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 );
-			}
+	} else if ( val.bv_val[0] == '0' ) {
+		if( val.bv_len > 1 ) { /* "0<more>" */
+			return LDAP_INVALID_SYNTAX;
 		}
 
-		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 );
-			}
+		return LDAP_SUCCESS;
+	}
+
+	for( i=0; i < val.bv_len; i++ ) {
+		if( !ASCII_DIGIT(val.bv_val[i]) ) {
+			return LDAP_INVALID_SYNTAX;
 		}
 	}
 
-	if( nkeys == 0 ) {
-		/* no keys to generate */
-		*keysp = NULL;
-		return LDAP_SUCCESS;
+	return LDAP_SUCCESS;
+}
+
+static int
+integerMatch(
+	int *matchp,
+	slap_mask_t flags,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *value,
+	void *assertedValue )
+{
+	struct berval *asserted = (struct berval *) assertedValue;
+	int vsign = 1, asign = 1;	/* default sign = '+' */
+	struct berval v, a;
+	int match;
+
+	v = *value;
+	if( v.bv_val[0] == '-' ) {
+		vsign = -1;
+		v.bv_val++;
+		v.bv_len--;
 	}
 
-	keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
+	if( v.bv_len == 0 ) vsign = 0;
 
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+	a = *asserted;
+	if( a.bv_val[0] == '-' ) {
+		asign = -1;
+		a.bv_val++;
+		a.bv_len--;
+	}
 
-	nkeys=0;
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		int j,max;
-		struct berval value;
+	if( a.bv_len == 0 ) vsign = 0;
 
-		if( values[i].bv_len < SLAP_INDEX_SUBSTR_MINLEN ) continue;
+	match = vsign - asign;
+	if( match == 0 ) {
+		match = ( v.bv_len != a.bv_len
+			? ( v.bv_len < a.bv_len ? -1 : 1 )
+			: memcmp( v.bv_val, a.bv_val, v.bv_len ));
+		if( vsign < 0 ) match = -match;
+	}
 
-		ber_dupbv( &value, &values[i] );
-		ldap_pvt_str2lower( value.bv_val );
+	*matchp = match;
+	return LDAP_SUCCESS;
+}
+	
+static int
+countryStringValidate(
+	Syntax *syntax,
+	struct berval *val )
+{
+	if( val->bv_len != 2 ) return LDAP_INVALID_SYNTAX;
 
-		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);
+	if( !SLAP_PRINTABLE(val->bv_val[0]) ) {
+		return LDAP_INVALID_SYNTAX;
+	}
+	if( !SLAP_PRINTABLE(val->bv_val[1]) ) {
+		return LDAP_INVALID_SYNTAX;
+	}
 
-			for( j=0; j<max; j++ ) {
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
+	return LDAP_SUCCESS;
+}
 
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&value.bv_val[j],
-					SLAP_INDEX_SUBSTR_MAXLEN );
-				HASH_Final( HASHdigest, &HASHcontext );
+static int
+printableStringValidate(
+	Syntax *syntax,
+	struct berval *val )
+{
+	ber_len_t i;
 
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
-		}
+	if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX;
 
-		max = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
-			? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
+	for(i=0; i < val->bv_len; i++) {
+		if( !SLAP_PRINTABLE(val->bv_val[i]) ) {
+			return LDAP_INVALID_SYNTAX;
+		}
+	}
 
-		for( j=SLAP_INDEX_SUBSTR_MINLEN; j<=max; j++ ) {
-			char pre;
+	return LDAP_SUCCESS;
+}
 
-			if( flags & SLAP_INDEX_SUBSTR_INITIAL ) {
-				pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					value.bv_val, j );
-				HASH_Final( HASHdigest, &HASHcontext );
+static int
+printablesStringValidate(
+	Syntax *syntax,
+	struct berval *val )
+{
+	ber_len_t i, len;
 
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
+	if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX;
 
-			if( flags & SLAP_INDEX_SUBSTR_FINAL ) {
-				pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&value.bv_val[value.bv_len-j], j );
-				HASH_Final( HASHdigest, &HASHcontext );
+	for(i=0,len=0; i < val->bv_len; i++) {
+		int c = val->bv_val[i];
 
-				ber_dupbv( &keys[nkeys++], &digest );
+		if( c == '$' ) {
+			if( len == 0 ) {
+				return LDAP_INVALID_SYNTAX;
 			}
+			len = 0;
 
+		} else if ( SLAP_PRINTABLE(c) ) {
+			len++;
+		} else {
+			return LDAP_INVALID_SYNTAX;
 		}
-
-		free( value.bv_val );
 	}
 
-	if( nkeys > 0 ) {
-		keys[nkeys].bv_val = NULL;
-		*keysp = keys;
-	} else {
-		ch_free( keys );
-		*keysp = NULL;
+	if( len == 0 ) {
+		return LDAP_INVALID_SYNTAX;
 	}
 
 	return LDAP_SUCCESS;
 }
 
-static int caseIgnoreIA5SubstringsFilter(
-	slap_mask_t use,
-	slap_mask_t flags,
+static int
+IA5StringValidate(
 	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
+	struct berval *val )
 {
-	SubstringsAssertion *sa = assertValue;
-	char pre;
-	ber_len_t nkeys = 0;
-	size_t slen, mlen, klen;
-	BerVarray keys;
-	HASH_CONTEXT   HASHcontext;
-	unsigned char	HASHdigest[HASH_BYTES];
-	struct berval value;
-	struct berval digest;
+	ber_len_t i;
 
-	if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial.bv_val != NULL &&
-		sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		nkeys++;
-	}
+	if( val->bv_len == 0 ) return LDAP_INVALID_SYNTAX;
 
-	if((flags & SLAP_INDEX_SUBSTR_ANY) && sa->sa_any != NULL ) {
-		ber_len_t i;
-		for( i=0; sa->sa_any[i].bv_val != 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 );
-			}
+	for(i=0; i < val->bv_len; i++) {
+		if( !LDAP_ASCII(val->bv_val[i]) ) {
+			return LDAP_INVALID_SYNTAX;
 		}
 	}
 
-	if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final.bv_val != NULL &&
-		sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		nkeys++;
-	}
+	return LDAP_SUCCESS;
+}
 
-	if( nkeys == 0 ) {
-		*keysp = NULL;
-		return LDAP_SUCCESS;
-	}
+static int
+IA5StringNormalize(
+	slap_mask_t use,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *val,
+	struct berval *normalized,
+	void *ctx )
+{
+	char *p, *q;
+	int casefold = !SLAP_MR_ASSOCIATED(mr, slap_schema.si_mr_caseExactIA5Match);
 
-	digest.bv_val = HASHdigest;
-	digest.bv_len = sizeof(HASHdigest);
+	assert( val->bv_len );
 
-	slen = syntax->ssyn_oidlen;
-	mlen = mr->smr_oidlen;
+	assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ));
 
-	keys = ch_malloc( sizeof( struct berval ) * (nkeys+1) );
-	nkeys = 0;
+	p = val->bv_val;
 
-	if((flags & SLAP_INDEX_SUBSTR_INITIAL) && sa->sa_initial.bv_val != NULL &&
-		sa->sa_initial.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		pre = SLAP_INDEX_SUBSTR_INITIAL_PREFIX;
-		ber_dupbv( &value, &sa->sa_initial );
-		ldap_pvt_str2lower( value.bv_val );
+	/* Ignore initial whitespace */
+	while ( ASCII_SPACE( *p ) ) p++;
 
-		klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
-			? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
+	normalized->bv_val = ber_strdup_x( p, ctx );
+	p = q = normalized->bv_val;
 
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
-		}
-		HASH_Update( &HASHcontext,
-			&pre, sizeof( pre ) );
-		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			value.bv_val, klen );
-		HASH_Final( HASHdigest, &HASHcontext );
+	while ( *p ) {
+		if ( ASCII_SPACE( *p ) ) {
+			*q++ = *p++;
+
+			/* Ignore the extra whitespace */
+			while ( ASCII_SPACE( *p ) ) {
+				p++;
+			}
 
-		free( value.bv_val );
-		ber_dupbv( &keys[nkeys++], &digest );
+		} else if ( casefold ) {
+			/* Most IA5 rules require casefolding */
+			*q++ = TOLOWER(*p++);
+
+		} else {
+			*q++ = *p++;
+		}
 	}
 
-	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;
+	assert( normalized->bv_val <= p );
+	assert( q <= p );
 
-		for( i=0; sa->sa_any[i].bv_val != NULL; i++ ) {
-			if( sa->sa_any[i].bv_len < SLAP_INDEX_SUBSTR_MAXLEN ) {
-				continue;
-			}
+	/*
+	 * If the string ended in space, backup the pointer one
+	 * position.  One is enough because the above loop collapsed
+	 * all whitespace to a single space.
+	 */
+	if ( ASCII_SPACE( q[-1] ) ) --q;
 
-			ber_dupbv( &value, &sa->sa_any[i] );
-			ldap_pvt_str2lower( value.bv_val );
+	/* null terminate */
+	*q = '\0';
 
-			for(j=0;
-				j <= value.bv_len - SLAP_INDEX_SUBSTR_MAXLEN;
-				j += SLAP_INDEX_SUBSTR_STEP )
-			{
-				HASH_Init( &HASHcontext );
-				if( prefix != NULL && prefix->bv_len > 0 ) {
-					HASH_Update( &HASHcontext,
-						prefix->bv_val, prefix->bv_len );
-				}
-				HASH_Update( &HASHcontext,
-					&pre, sizeof( pre ) );
-				HASH_Update( &HASHcontext,
-					syntax->ssyn_oid, slen );
-				HASH_Update( &HASHcontext,
-					mr->smr_oid, mlen );
-				HASH_Update( &HASHcontext,
-					&value.bv_val[j], klen );
-				HASH_Final( HASHdigest, &HASHcontext );
+	normalized->bv_len = q - normalized->bv_val;
+	if( normalized->bv_len == 0 ) {
+		normalized->bv_val = sl_realloc( normalized->bv_val, 2, ctx );
+		normalized->bv_val[0] = ' ';
+		normalized->bv_val[1] = '\0';
+		normalized->bv_len = 1;
+	}
 
-				ber_dupbv( &keys[nkeys++], &digest );
-			}
+	return LDAP_SUCCESS;
+}
+
+static int
+UUIDValidate(
+	Syntax *syntax,
+	struct berval *in )
+{
+	int i;
+	if( in->bv_len != 36 ) {
+		assert(0);
+		return LDAP_INVALID_SYNTAX;
+	}
 
-			free( value.bv_val );
+	for( i=0; i<36; i++ ) {
+		switch(i) {
+			case 8:
+			case 13:
+			case 18:
+			case 23:
+				if( in->bv_val[i] != '-' ) {
+					return LDAP_INVALID_SYNTAX;
+				}
+				break;
+			default:
+				if( !ASCII_HEX( in->bv_val[i]) ) {
+					return LDAP_INVALID_SYNTAX;
+				}
 		}
 	}
+	
+	return LDAP_SUCCESS;
+}
 
-	if((flags & SLAP_INDEX_SUBSTR_FINAL) && sa->sa_final.bv_val != NULL &&
-		sa->sa_final.bv_len >= SLAP_INDEX_SUBSTR_MINLEN )
-	{
-		pre = SLAP_INDEX_SUBSTR_FINAL_PREFIX;
-		ber_dupbv( &value, &sa->sa_final );
-		ldap_pvt_str2lower( value.bv_val );
+static int
+UUIDNormalize(
+	slap_mask_t usage,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *val,
+	struct berval *normalized,
+	void *ctx )
+{
+	unsigned char octet = '\0';
+	int i;
+	int j;
+	normalized->bv_len = 16;
+	normalized->bv_val = sl_malloc( normalized->bv_len+1, ctx );
+
+	for( i=0, j=0; i<36; i++ ) {
+		unsigned char nibble;
+		if( val->bv_val[i] == '-' ) {
+			continue;
 
-		klen = SLAP_INDEX_SUBSTR_MAXLEN < value.bv_len
-			? SLAP_INDEX_SUBSTR_MAXLEN : value.bv_len;
+		} else if( ASCII_DIGIT( val->bv_val[i] ) ) {
+			nibble = val->bv_val[i] - '0';
 
-		HASH_Init( &HASHcontext );
-		if( prefix != NULL && prefix->bv_len > 0 ) {
-			HASH_Update( &HASHcontext,
-				prefix->bv_val, prefix->bv_len );
-		}
-		HASH_Update( &HASHcontext,
-			&pre, sizeof( pre ) );
-		HASH_Update( &HASHcontext,
-			syntax->ssyn_oid, slen );
-		HASH_Update( &HASHcontext,
-			mr->smr_oid, mlen );
-		HASH_Update( &HASHcontext,
-			&value.bv_val[value.bv_len-klen], klen );
-		HASH_Final( HASHdigest, &HASHcontext );
+		} else if( ASCII_HEXLOWER( val->bv_val[i] ) ) {
+			nibble = val->bv_val[i] - ('a'-10);
 
-		free( value.bv_val );
-		ber_dupbv( &keys[nkeys++], &digest );
-	}
+		} else if( ASCII_HEXUPPER( val->bv_val[i] ) ) {
+			nibble = val->bv_val[i] - ('A'-10);
 
-	if( nkeys > 0 ) {
-		keys[nkeys].bv_val = NULL;
-		*keysp = keys;
-	} else {
-		ch_free( keys );
-		*keysp = NULL;
+		} else {
+			sl_free( normalized->bv_val, ctx );
+			return LDAP_INVALID_SYNTAX;
+		}
+
+		if( j & 1 ) {
+			octet |= nibble;
+			normalized->bv_val[j>>1] = octet;
+		} else {
+			octet = nibble << 4;
+		}
+		j++;
 	}
 
+	normalized->bv_val[normalized->bv_len] = 0;
 	return LDAP_SUCCESS;
 }
-	
+
+
+
 static int
 numericStringValidate(
 	Syntax *syntax,
@@ -3386,16 +1880,19 @@ numericStringValidate(
 
 static int
 numericStringNormalize(
+	slap_mask_t usage,
 	Syntax *syntax,
+	MatchingRule *mr,
 	struct berval *val,
-	struct berval *normalized )
+	struct berval *normalized,
+	void *ctx )
 {
 	/* removal all spaces */
 	char *p, *q;
 
 	assert( val->bv_len );
 
-	normalized->bv_val = ch_malloc( val->bv_len + 1 );
+	normalized->bv_val = sl_malloc( val->bv_len + 1, ctx );
 
 	p = val->bv_val;
 	q = normalized->bv_val;
@@ -3418,7 +1915,7 @@ numericStringNormalize(
 	normalized->bv_len = q - normalized->bv_val;
 
 	if( normalized->bv_len == 0 ) {
-		normalized->bv_val = ch_realloc( normalized->bv_val, 2 );
+		normalized->bv_val = sl_realloc( normalized->bv_val, 2, ctx );
 		normalized->bv_val[0] = ' ';
 		normalized->bv_val[1] = '\0';
 		normalized->bv_len = 1;
@@ -3427,93 +1924,21 @@ numericStringNormalize(
 	return LDAP_SUCCESS;
 }
 
-static int
-objectIdentifierFirstComponentMatch(
-	int *matchp,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
-{
-	int rc = LDAP_SUCCESS;
-	int match;
-	struct berval *asserted = (struct berval *) assertedValue;
-	ber_len_t i;
-	struct berval oid;
-
-	if( value->bv_len == 0 || value->bv_val[0] != '(' /*')'*/ ) {
-		return LDAP_INVALID_SYNTAX;
-	}
-
-	/* trim leading white space */
-	for( i=1; ASCII_SPACE(value->bv_val[i]) && i < value->bv_len; i++ ) {
-		/* empty */
-	}
-
-	/* grab next word */
-	oid.bv_val = &value->bv_val[i];
-	oid.bv_len = value->bv_len - i;
-	for( i=1; ASCII_SPACE(value->bv_val[i]) && i < oid.bv_len; i++ ) {
-		/* empty */
-	}
-	oid.bv_len = i;
-
-	/* insert attributeTypes, objectclass check here */
-	if( OID_LEADCHAR(asserted->bv_val[0]) ) {
-		rc = objectIdentifierMatch( &match, flags, syntax, mr, &oid, asserted );
-
-	} else {
-		if ( !strcmp( syntax->ssyn_oid, SLAP_SYNTAX_MATCHINGRULES_OID ) ) {
-			MatchingRule *asserted_mr = mr_bvfind( asserted );
-			MatchingRule *stored_mr = mr_bvfind( &oid );
-
-			if( asserted_mr == NULL ) {
-				rc = SLAPD_COMPARE_UNDEFINED;
-			} else {
-				match = asserted_mr != stored_mr;
-			}
-
-		} else if ( !strcmp( syntax->ssyn_oid,
-			SLAP_SYNTAX_ATTRIBUTETYPES_OID ) )
-		{
-			AttributeType *asserted_at = at_bvfind( asserted );
-			AttributeType *stored_at = at_bvfind( &oid );
-
-			if( asserted_at == NULL ) {
-				rc = SLAPD_COMPARE_UNDEFINED;
-			} else {
-				match = asserted_at != stored_at;
-			}
-
-		} else if ( !strcmp( syntax->ssyn_oid,
-			SLAP_SYNTAX_OBJECTCLASSES_OID ) )
-		{
-			ObjectClass *asserted_oc = oc_bvfind( asserted );
-			ObjectClass *stored_oc = oc_bvfind( &oid );
-
-			if( asserted_oc == NULL ) {
-				rc = SLAPD_COMPARE_UNDEFINED;
-			} else {
-				match = asserted_oc != stored_oc;
-			}
-		}
-	}
-
-#ifdef NEW_LOGGING
-	LDAP_LOG( CONFIG, ENTRY, 
-		"objectIdentifierFirstComponentMatch: %d\n %s\n %s\n",
-		match, value->bv_val, asserted->bv_val );
+/*
+ * Integer conversion macros that will use the largest available
+ * type.
+ */
+#if defined(HAVE_STRTOLL) && defined(LLONG_MAX) && defined(LLONG_MIN) && defined(HAVE_LONG_LONG)
+# define SLAP_STRTOL(n,e,b)  strtoll(n,e,b) 
+# define SLAP_LONG_MAX       LLONG_MAX
+# define SLAP_LONG_MIN       LLONG_MIN
+# define SLAP_LONG           long long
 #else
-	Debug( LDAP_DEBUG_ARGS, "objectIdentifierFirstComponentMatch "
-		"%d\n\t\"%s\"\n\t\"%s\"\n",
-		match, value->bv_val, asserted->bv_val );
-#endif
-
-
-	if( rc == LDAP_SUCCESS ) *matchp = match;
-	return rc;
-}
+# define SLAP_STRTOL(n,e,b)  strtol(n,e,b)
+# define SLAP_LONG_MAX       LONG_MAX
+# define SLAP_LONG_MIN       LONG_MIN
+# define SLAP_LONG           long
+#endif /* HAVE_STRTOLL ... */
 
 static int
 integerBitAndMatch(
@@ -3524,18 +1949,22 @@ integerBitAndMatch(
 	struct berval *value,
 	void *assertedValue )
 {
-	long lValue, lAssertedValue;
+	SLAP_LONG lValue, lAssertedValue;
 
 	/* safe to assume integers are NUL terminated? */
-	lValue = strtoul(value->bv_val, NULL, 10);
-	if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
+	lValue = SLAP_STRTOL(value->bv_val, NULL, 10);
+	if(( lValue == SLAP_LONG_MIN || lValue == SLAP_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 )
+	lAssertedValue = SLAP_STRTOL(((struct berval *)assertedValue)->bv_val, NULL, 10);
+	if(( lAssertedValue == SLAP_LONG_MIN || lAssertedValue == SLAP_LONG_MAX )
+		&& errno == ERANGE )
+	{
 		return LDAP_CONSTRAINT_VIOLATION;
+	}
 
-	*matchp = (lValue & lAssertedValue);
+	*matchp = (lValue & lAssertedValue) ? 0 : 1;
 	return LDAP_SUCCESS;
 }
 
@@ -3548,560 +1977,487 @@ integerBitOrMatch(
 	struct berval *value,
 	void *assertedValue )
 {
-	long lValue, lAssertedValue;
+	SLAP_LONG lValue, lAssertedValue;
 
 	/* safe to assume integers are NUL terminated? */
-	lValue = strtoul(value->bv_val, NULL, 10);
-	if(( lValue == LONG_MIN || lValue == LONG_MAX) && errno == ERANGE )
+	lValue = SLAP_STRTOL(value->bv_val, NULL, 10);
+	if(( lValue == SLAP_LONG_MIN || lValue == SLAP_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 )
+	lAssertedValue = SLAP_STRTOL(((struct berval *)assertedValue)->bv_val, NULL, 10);
+	if(( lAssertedValue == SLAP_LONG_MIN || lAssertedValue == SLAP_LONG_MAX )
+		&& errno == ERANGE )
+	{
 		return LDAP_CONSTRAINT_VIOLATION;
+	}
 
-	*matchp = (lValue | lAssertedValue);
+	*matchp = (lValue | lAssertedValue) ? 0 : -1;
 	return LDAP_SUCCESS;
 }
 
-#ifdef HAVE_TLS
-#include <openssl/x509.h>
-#include <openssl/err.h>
-char digit[] = "0123456789";
+static int
+serialNumberAndIssuerValidate(
+	Syntax *syntax,
+	struct berval *in )
+{
+	int rc;
+	int state;
+	ber_len_t n;
+	struct berval sn, i;
+	if( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX;
 
-/*
- * Next function returns a string representation of a ASN1_INTEGER.
- * It works for unlimited lengths.
- */
+	i.bv_val = strchr( in->bv_val, '$' );
+	if( i.bv_val == NULL ) return LDAP_INVALID_SYNTAX;
 
-static struct berval *
-asn1_integer2str(ASN1_INTEGER *a, struct berval *bv)
-{
-	char buf[256];
-	char *p;
-  
-	/* We work backwards, make it fill from the end of buf */
-	p = buf + sizeof(buf) - 1;
-	*p = '\0';
+	sn.bv_val = in->bv_val;
+	sn.bv_len = i.bv_val - in->bv_val;
 
-	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];
-		}
+	i.bv_val++;
+	i.bv_len = in->bv_len - (sn.bv_len + 1);
 
-		/* 
-		 * 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;
-
-			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
-				 */
-				free(copy);
-				return NULL;
-			}
-			*--p = digit[carry];
-			if (copy[base] == 0)
-				base++;
+	/* validate serial number (strict for now) */
+	for( n=0; n < sn.bv_len; n++ ) {
+		if( !ASCII_DIGIT(sn.bv_val[n]) ) {
+			return LDAP_INVALID_SYNTAX;
 		}
-		free(copy);
 	}
 
-	if ( a->type == V_ASN1_NEG_INTEGER ) {
-		*--p = '-';
-	}
+	/* validate DN */
+	rc = dnValidate( NULL, &i );
+	if( rc ) return LDAP_INVALID_SYNTAX;
 
-	return ber_str2bv( p, 0, 1, bv );
+	return LDAP_SUCCESS;
 }
 
-/*
- * Given a certificate in DER format, extract the corresponding
- * assertion value for certificateExactMatch
- */
-static int
-certificateExactConvert(
-	struct berval * in,
-	struct berval * out )
+int
+serialNumberAndIssuerPretty(
+	Syntax *syntax,
+	struct berval *val,
+	struct berval *out,
+	void *ctx )
 {
-	X509 *xcert;
-	unsigned char *p = in->bv_val;
-	struct berval serial;
-	struct berval issuer_dn;
+	int rc;
+	int state;
+	ber_len_t n;
+	struct berval sn, i, newi;
+
+	assert( val );
+	assert( out );
 
-	xcert = d2i_X509(NULL, &p, in->bv_len);
-	if ( !xcert ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, ENTRY, 
-			"certificateExactConvert: error parsing cert: %s\n",
-			ERR_error_string(ERR_get_error(),NULL), 0, 0 );
+	LDAP_LOG( OPERATION, ARGS, ">>> serialNumberAndIssuerPretty: <%s>\n",
+		val->bv_val, 0, 0 );
 #else
-		Debug( LDAP_DEBUG_ARGS, "certificateExactConvert: "
-		       "error parsing cert: %s\n",
-		       ERR_error_string(ERR_get_error(),NULL), NULL, NULL );
+	Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerPretty: <%s>\n",
+		val->bv_val, 0, 0 );
 #endif
-		return LDAP_INVALID_SYNTAX;
-	}
 
-	if ( !asn1_integer2str(xcert->cert_info->serialNumber, &serial) ) {
-		X509_free(xcert);
-		return LDAP_INVALID_SYNTAX;
-	}
-	if ( dnX509normalize(X509_get_issuer_name(xcert), &issuer_dn ) != LDAP_SUCCESS ) {
-		X509_free(xcert);
-		ber_memfree(serial.bv_val);
-		return LDAP_INVALID_SYNTAX;
-	}
+	if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX;
 
-	X509_free(xcert);
+	i.bv_val = strchr( val->bv_val, '$' );
+	if( i.bv_val == NULL ) return LDAP_INVALID_SYNTAX;
 
-	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, " $ ", sizeof(" $ ")-1);
-	p += 3;
-	AC_MEMCPY(p, issuer_dn.bv_val, issuer_dn.bv_len);
-	p += issuer_dn.bv_len;
-	*p++ = '\0';
+	sn.bv_val = val->bv_val;
+	sn.bv_len = i.bv_val - val->bv_val;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG( CONFIG, ARGS, 
-		"certificateExactConvert: \n	%s\n", out->bv_val, 0, 0 );
-#else
-	Debug( LDAP_DEBUG_ARGS, "certificateExactConvert "
-		"\n\t\"%s\"\n",
-		out->bv_val, NULL, NULL );
-#endif
+	i.bv_val++;
+	i.bv_len = val->bv_len - (sn.bv_len + 1);
 
-	ber_memfree(serial.bv_val);
-	ber_memfree(issuer_dn.bv_val);
+	/* eat leading zeros */
+	for( n=0; n < (sn.bv_len-1); n++ ) {
+		if( sn.bv_val[n] != '0' ) break;
+	}
+	sn.bv_val += n;
+	sn.bv_len -= n;
 
-	return LDAP_SUCCESS;
-}
+	for( n=0; n < sn.bv_len; n++ ) {
+		if( !ASCII_DIGIT(sn.bv_val[n]) ) {
+			return LDAP_INVALID_SYNTAX;
+		}
+	}
 
-static int
-serial_and_issuer_parse(
-	struct berval *assertion,
-	struct berval *serial,
-	struct berval *issuer_dn
-)
-{
-	char *begin;
-	char *end;
-	char *p;
-	struct berval bv;
-
-	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;
+	/* pretty DN */
+	rc = dnPretty( syntax, &i, &newi, ctx );
+	if( rc ) return LDAP_INVALID_SYNTAX;
+
+	/* make room from sn + "$" */
+	out->bv_len = sn.bv_len + newi.bv_len + 1;
+	out->bv_val = sl_realloc( newi.bv_val, out->bv_len + 1, ctx );
 
-	/* p now points at the $ sign, now use begin and end to delimit the
-	   serial number */
-	while (ASCII_SPACE(*begin))
-		begin++;
-	end = p-1;
-	while (ASCII_SPACE(*end))
-		end--;
-
-	bv.bv_len = end-begin+1;
-	bv.bv_val = begin;
-	ber_dupbv(serial, &bv);
-
-	/* now extract the issuer, remember p was at the dollar sign */
-	if ( issuer_dn ) {
-		begin = p+1;
-		end = assertion->bv_val+assertion->bv_len-1;
-		while (ASCII_SPACE(*begin))
-			begin++;
-		/* should we trim spaces at the end too? is it safe always? */
-
-		bv.bv_len = end-begin+1;
-		bv.bv_val = begin;
-		dnNormalize2( NULL, &bv, issuer_dn );
+	if( out->bv_val == NULL ) {
+		sl_free( newi.bv_val, ctx );
+		return LDAP_OTHER;
 	}
 
+	/* push issuer over */
+	AC_MEMCPY( &out->bv_val[sn.bv_len+1], newi.bv_val, newi.bv_len );
+	/* insert sn and "$" */
+	AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len );
+	out->bv_val[sn.bv_len] = '$';
+	/* terminate */
+	out->bv_val[out->bv_len] = '\0';
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, "<<< serialNumberAndIssuerPretty: <%s>\n",
+		out->bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerPretty: <%s>\n",
+		out->bv_val, 0, 0 );
+#endif
+
 	return LDAP_SUCCESS;
 }
 
+/*
+ * This routine is called by certificateExactNormalize when
+ * certificateExactNormalize receives a search string instead of
+ * a certificate. This routine checks if the search value is valid
+ * and then returns the normalized value
+ */
 static int
-certificateExactMatch(
-	int *matchp,
-	slap_mask_t flags,
+serialNumberAndIssuerNormalize(
+	slap_mask_t usage,
 	Syntax *syntax,
 	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
+	struct berval *val,
+	struct berval *out,
+	void *ctx )
 {
-	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 ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, ENTRY, 
-			"certificateExactMatch: error parsing cert: %s\n",
-			ERR_error_string(ERR_get_error(),NULL), 0, 0 );
-#else
-		Debug( LDAP_DEBUG_ARGS, "certificateExactMatch: "
-		       "error parsing cert: %s\n",
-		       ERR_error_string(ERR_get_error(),NULL), NULL, NULL );
-#endif
-		return LDAP_INVALID_SYNTAX;
-	}
-
-	asn1_integer2str(xcert->cert_info->serialNumber, &serial);
-	dnX509normalize(X509_get_issuer_name(xcert), &issuer_dn);
-
-	X509_free(xcert);
+	int rc;
+	int state;
+	ber_len_t n;
+	struct berval sn, i, newi;
 
-	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 ) {
-			/* We need to normalize everything for dnMatch */
-			ret = dnMatch(
-				matchp,
-				flags,
-				slap_schema.si_syn_distinguishedName,
-				slap_schema.si_mr_distinguishedNameMatch,
-				&issuer_dn,
-				&asserted_issuer_dn);
-		}
-	}
+	assert( val );
+	assert( out );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG( CONFIG, ARGS, "certificateExactMatch "
-		"%d\n\t\"%s $ %s\"\n",
-		*matchp, serial.bv_val, issuer_dn.bv_val );
-	LDAP_LOG( CONFIG, ARGS, "\t\"%s $ %s\"\n",
-		asserted_serial.bv_val, asserted_issuer_dn.bv_val,
-		0 );
+	LDAP_LOG( OPERATION, ARGS, ">>> serialNumberAndIssuerNormalize: <%s>\n",
+		val->bv_val, 0, 0 );
 #else
-	Debug( LDAP_DEBUG_ARGS, "certificateExactMatch "
-		"%d\n\t\"%s $ %s\"\n",
-		*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,
-		NULL );
+	Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerNormalize: <%s>\n",
+		val->bv_val, 0, 0 );
 #endif
 
-	ber_memfree(serial.bv_val);
-	ber_memfree(issuer_dn.bv_val);
-	ber_memfree(asserted_serial.bv_val);
-	ber_memfree(asserted_issuer_dn.bv_val);
+	if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX;
 
-	return ret;
-}
+	i.bv_val = strchr( val->bv_val, '$' );
+	if( i.bv_val == NULL ) return LDAP_INVALID_SYNTAX;
 
-/* 
- * Index generation function
- * We just index the serials, in most scenarios the issuer DN is one of
- * a very small set of values.
- */
-static int certificateExactIndexer(
-	slap_mask_t use,
-	slap_mask_t flags,
-	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *prefix,
-	BerVarray values,
-	BerVarray *keysp )
-{
-	int i;
-	BerVarray keys;
-	X509 *xcert;
-	unsigned char *p;
-	struct berval serial;
+	sn.bv_val = val->bv_val;
+	sn.bv_len = i.bv_val - val->bv_val;
 
-	/* we should have at least one value at this point */
-	assert( values != NULL && values[0].bv_val != NULL );
+	i.bv_val++;
+	i.bv_len = val->bv_len - (sn.bv_len + 1);
 
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		/* empty -- just count them */
+	/* eat leading zeros */
+	for( n=0; n < (sn.bv_len-1); n++ ) {
+		if( sn.bv_val[n] != '0' ) break;
 	}
+	sn.bv_val += n;
+	sn.bv_len -= n;
 
-	keys = ch_malloc( sizeof( struct berval ) * (i+1) );
-
-	for( i=0; values[i].bv_val != NULL; i++ ) {
-		p = values[i].bv_val;
-		xcert = d2i_X509(NULL, &p, values[i].bv_len);
-		if ( !xcert ) {
-#ifdef NEW_LOGGING
-			LDAP_LOG( CONFIG, ENTRY, 
-				"certificateExactIndexer: error parsing cert: %s\n",
-				ERR_error_string(ERR_get_error(),NULL), 0, 0);
-#else
-			Debug( LDAP_DEBUG_ARGS, "certificateExactIndexer: "
-			       "error parsing cert: %s\n",
-			       ERR_error_string(ERR_get_error(),NULL),
-			       NULL, NULL );
-#endif
-			/* Do we leak keys on error? */
+	for( n=0; n < sn.bv_len; n++ ) {
+		if( !ASCII_DIGIT(sn.bv_val[n]) ) {
 			return LDAP_INVALID_SYNTAX;
 		}
+	}
+
+	/* pretty DN */
+	rc = dnNormalize( usage, syntax, mr, &i, &newi, ctx );
+	if( rc ) return LDAP_INVALID_SYNTAX;
+
+	/* make room from sn + "$" */
+	out->bv_len = sn.bv_len + newi.bv_len + 1;
+	out->bv_val = sl_realloc( newi.bv_val, out->bv_len + 1, ctx );
+
+	if( out->bv_val == NULL ) {
+		sl_free( newi.bv_val, ctx );
+		return LDAP_OTHER;
+	}
+
+	/* push issuer over */
+	AC_MEMCPY( &out->bv_val[sn.bv_len+1], newi.bv_val, newi.bv_len );
+	/* insert sn and "$" */
+	AC_MEMCPY( out->bv_val, sn.bv_val, sn.bv_len );
+	out->bv_val[sn.bv_len] = '$';
+	/* terminate */
+	out->bv_val[out->bv_len] = '\0';
 
-		asn1_integer2str(xcert->cert_info->serialNumber, &serial);
-		X509_free(xcert);
-		integerNormalize( slap_schema.si_syn_integer,
-				  &serial,
-				  &keys[i] );
-		ber_memfree(serial.bv_val);
 #ifdef NEW_LOGGING
-		LDAP_LOG( CONFIG, ENTRY, 
-			"certificateExactIndexer: returning: %s\n", keys[i].bv_val, 0, 0);
+	LDAP_LOG( OPERATION, ARGS, "<<< serialNumberAndIssuerNormalize: <%s>\n",
+		out->bv_val, 0, 0 );
 #else
-		Debug( LDAP_DEBUG_ARGS, "certificateExactIndexer: "
-		       "returning: %s\n",
-		       keys[i].bv_val,
-		       NULL, NULL );
+	Debug( LDAP_DEBUG_TRACE, "<<< serialNumberAndIssuerNormalize: <%s>\n",
+		out->bv_val, 0, 0 );
 #endif
-	}
 
-	keys[i].bv_val = NULL;
-	*keysp = keys;
-	return LDAP_SUCCESS;
+	return rc;
 }
 
-/* Index generation function */
-/* We think this is always called with a value in matching rule syntax */
-static int certificateExactFilter(
-	slap_mask_t use,
-	slap_mask_t flags,
+#ifdef HAVE_TLS
+static int
+certificateExactNormalize(
+	slap_mask_t usage,
 	Syntax *syntax,
 	MatchingRule *mr,
-	struct berval *prefix,
-	void * assertValue,
-	BerVarray *keysp )
+	struct berval *val,
+	struct berval *normalized,
+	void *ctx )
 {
-	BerVarray keys;
-	struct berval asserted_serial;
+	int rc = LDAP_INVALID_SYNTAX;
+	unsigned char *p;
+	char *serial = NULL;
+	ber_len_t seriallen;
+	struct berval issuer_dn = { 0, NULL };
+	X509_NAME *name = NULL;
+	ASN1_INTEGER *sn = NULL;
+	X509 *xcert = NULL;
+
+	if( val->bv_len == 0 ) goto done;
+
+	if( SLAP_MR_IS_VALUE_OF_ASSERTION_SYNTAX(usage) ) {
+		return serialNumberAndIssuerNormalize(0,NULL,NULL,val,normalized,ctx);
+	}
+
+	assert( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX(usage) );
+
+	p = (unsigned char *)val->bv_val;
+	xcert = d2i_X509( NULL, &p, val->bv_len);
+	if( xcert == NULL ) goto done;
+
+	sn=X509_get_serialNumber(xcert);
+	if ( sn == NULL ) goto done;
+	serial=i2s_ASN1_INTEGER(0, sn );
+	if( serial == NULL ) goto done;
+	seriallen=strlen(serial);
+
+	name=X509_get_issuer_name(xcert);
+	if( name == NULL ) goto done;
+	rc = dnX509normalize( name, &issuer_dn );
+	if( rc != LDAP_SUCCESS ) goto done;
+
+	normalized->bv_len = seriallen + issuer_dn.bv_len + 1;
+	normalized->bv_val = ch_malloc(normalized->bv_len+1);
+	p = (unsigned char *)normalized->bv_val;
+	AC_MEMCPY(p, serial, seriallen);
+	p += seriallen;
+	*p++ = '$';
+	AC_MEMCPY(p, issuer_dn.bv_val, issuer_dn.bv_len);
+	p += issuer_dn.bv_len;
+	*p = '\0';
 
-	serial_and_issuer_parse(assertValue,
-				&asserted_serial,
-				NULL);
+#ifdef NEW_LOGGING
+	LDAP_LOG( CONFIG, ARGS, "certificateExactNormalize: %s\n",
+		normalized->bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "certificateExactNormalize: %s\n",
+		normalized->bv_val, NULL, NULL );
+#endif
 
-	keys = ch_malloc( sizeof( struct berval ) * 2 );
-	integerNormalize( syntax, &asserted_serial, &keys[0] );
-	keys[1].bv_val = NULL;
-	*keysp = keys;
+done:
+	if (xcert) X509_free(xcert);
+	if (serial) ch_free(serial);
+	if (issuer_dn.bv_val) ber_memfree(issuer_dn.bv_val);
 
-	ber_memfree(asserted_serial.bv_val);
-	return LDAP_SUCCESS;
+	return rc;
 }
+#endif /* HAVE_TLS */
+
+
+#ifndef SUPPORT_OBSOLETE_UTC_SYNTAX
+/* slight optimization - does not need the start parameter */
+#define check_time_syntax(v, start, p, f) (check_time_syntax)(v, p, f)
+enum { start = 0 };
 #endif
 
 static int
 check_time_syntax (struct berval *val,
 	int start,
-	int *parts)
+	int *parts,
+	struct berval *fraction)
 {
-	static int ceiling[9] = { 99, 99, 11, 30, 23, 59, 59, 12, 59 };
-	static int mdays[2][12] = {
+	/*
+	 * start=0 GeneralizedTime YYYYmmddHH[MM[SS]][(./,)d...](Z|(+/-)HH[MM])
+	 * start=1 UTCTime         YYmmddHHMM[SS][Z|(+/-)HHMM]
+	 * GeneralizedTime supports leap seconds, UTCTime does not.
+	 */
+	static const int ceiling[9] = { 100, 100, 12, 31, 24, 60, 60, 24, 60 };
+	static const int mdays[2][12] = {
 		/* non-leap years */
-		{ 30, 27, 30, 29, 30, 29, 30, 30, 29, 30, 29, 30 },
+		{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
 		/* leap years */
-		{ 30, 28, 30, 29, 30, 29, 30, 30, 29, 30, 29, 30 }
+		{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
 	};
 	char *p, *e;
-	int part, c, tzoffset, leapyear = 0 ;
-
-	if( val->bv_len == 0 ) {
-		return LDAP_INVALID_SYNTAX;
-	}
+	int part, c, c1, c2, tzoffset, leapyear = 0;
 
-	p = (char *)val->bv_val;
+	p = val->bv_val;
 	e = p + val->bv_len;
 
-	/* Ignore initial whitespace */
-	while ( ( p < e ) && ASCII_SPACE( *p ) ) {
-		p++;
-	}
-
-	if (e - p < 13 - (2 * start)) {
-		return LDAP_INVALID_SYNTAX;
-	}
-
-	for (part = 0; part < 9; part++) {
-		parts[part] = 0;
-	}
-
-	for (part = start; part < 7; part++) {
-		c = *p;
-		if ((part == 6) && (c == 'Z' || c == '+' || c == '-')) {
-			part++;
+#ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
+	parts[0] = 20; /* century - any multiple of 4 from 04 to 96 */
+#endif
+	for (part = start; part < 7 && p < e; part++) {
+		c1 = *p;
+		if (!ASCII_DIGIT(c1)) {
 			break;
 		}
 		p++;
-		c -= '0';
-		if (p == e) {
-			return LDAP_INVALID_SYNTAX;
-		}
-		if (c < 0 || c > 9) {
-			return LDAP_INVALID_SYNTAX;
-		}
-		parts[part] = c;
-
-		c = *p++ - '0';
 		if (p == e) {
 			return LDAP_INVALID_SYNTAX;
 		}
-		if (c < 0 || c > 9) {
+		c = *p++;
+		if (!ASCII_DIGIT(c)) {
 			return LDAP_INVALID_SYNTAX;
 		}
-		parts[part] *= 10;
-		parts[part] += c;
-
-		if (part == 2 || part == 3) {
-			parts[part]--;
-		}
-		if (parts[part] < 0) {
-			return LDAP_INVALID_SYNTAX;
+		c += c1 * 10 - '0' * 11;
+		if ((part | 1) == 3) {
+			--c;
+			if (c < 0) {
+				return LDAP_INVALID_SYNTAX;
+			}
 		}
-		if (parts[part] > ceiling[part]) {
-			return LDAP_INVALID_SYNTAX;
+		if (c >= ceiling[part]) {
+			if (! (c == 60 && part == 6 && start == 0))
+				return LDAP_INVALID_SYNTAX;
 		}
+		parts[part] = c;
+	}
+	if (part < 5 + start) {
+		return LDAP_INVALID_SYNTAX;
+	}
+	for (; part < 9; part++) {
+		parts[part] = 0;
 	}
 
 	/* leapyear check for the Gregorian calendar (year>1581) */
-	if (((parts[1] % 4 == 0) && (parts[1] != 0)) ||
-		((parts[0] % 4 == 0) && (parts[1] == 0)))
+	if (parts[parts[1] == 0 ? 0 : 1] % 4 == 0)
 	{
 		leapyear = 1;
 	}
 
-	if (parts[3] > mdays[leapyear][parts[2]]) {
+	if (parts[3] >= mdays[leapyear][parts[2]]) {
 		return LDAP_INVALID_SYNTAX;
 	}
-	
-	c = *p++;
-	if (c == 'Z') {
-		tzoffset = 0; /* UTC */
-	} else if (c != '+' && c != '-') {
-		return LDAP_INVALID_SYNTAX;
-	} else {
-		if (c == '-') {
-			tzoffset = -1;
-		} else /* c == '+' */ {
-			tzoffset = 1;
-		}
-
-		if (p > e - 4) {
-			return LDAP_INVALID_SYNTAX;
-		}
-
-		for (part = 7; part < 9; part++) {
-			c = *p++ - '0';
-			if (c < 0 || c > 9) {
-				return LDAP_INVALID_SYNTAX;
-			}
-			parts[part] = c;
 
-			c = *p++ - '0';
-			if (c < 0 || c > 9) {
-				return LDAP_INVALID_SYNTAX;
-			}
-			parts[part] *= 10;
-			parts[part] += c;
-			if (parts[part] < 0 || parts[part] > ceiling[part]) {
+	if (start == 0) {
+		fraction->bv_val = p;
+		fraction->bv_len = 0;
+		if (p < e && (*p == '.' || *p == ',')) {
+			char *end_num;
+			while (++p < e && ASCII_DIGIT(*p))
+				;
+			if (p - fraction->bv_val == 1) {
 				return LDAP_INVALID_SYNTAX;
 			}
+			for (end_num = p; end_num[-1] == '0'; --end_num)
+				;
+			c = end_num - fraction->bv_val;
+			if (c != 1)
+				fraction->bv_len = c;
 		}
 	}
 
-	/* Ignore trailing whitespace */
-	while ( ( p < e ) && ASCII_SPACE( *p ) ) {
-		p++;
-	}
-	if (p != e) {
-		return LDAP_INVALID_SYNTAX;
+	if (p == e) {
+		/* no time zone */
+		return start == 0 ? LDAP_INVALID_SYNTAX : LDAP_SUCCESS;
 	}
 
-	switch ( tzoffset ) {
-	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 */
-			if (part != 3) {
-				c = ceiling[part];
-			} else {
-				c = mdays[leapyear][parts[2]];
+	tzoffset = *p++;
+	switch (tzoffset) {
+	default:
+		return LDAP_INVALID_SYNTAX;
+	case 'Z':
+		/* UTC */
+		break;
+	case '+':
+	case '-':
+		for (part = 7; part < 9 && p < e; part++) {
+			c1 = *p;
+			if (!ASCII_DIGIT(c1)) {
+				break;
+			}
+			p++;
+			if (p == e) {
+				return LDAP_INVALID_SYNTAX;
+			}
+			c2 = *p++;
+			if (!ASCII_DIGIT(c2)) {
+				return LDAP_INVALID_SYNTAX;
 			}
-			if (parts[part] > c) {
-				parts[part] -= c + 1;
-				parts[part - 1]++;
+			parts[part] = c1 * 10 + c2 - '0' * 11;
+			if (parts[part] >= ceiling[part]) {
+				return LDAP_INVALID_SYNTAX;
 			}
 		}
-		break;
-	case 1: /* positive offset to UTC, ie east of Greenwich */
-		parts[4] -= parts[7];
-		parts[5] -= parts[8];
-		for (part = 6; --part > 0; ) {
-			if (part != 3) {
-				c = ceiling[part];
-			} else {
-				/* first arg to % needs to be non negativ */
-				c = mdays[leapyear][(parts[2] - 1 + 12) % 12];
+		if (part < 8 + start) {
+			return LDAP_INVALID_SYNTAX;
+		}
+
+		if (tzoffset == '-') {
+			/* negative offset to UTC, ie west of Greenwich */
+			parts[4] += parts[7];
+			parts[5] += parts[8];
+			/* offset is just hhmm, no seconds */
+			for (part = 6; --part >= 0; ) {
+				if (part != 3) {
+					c = ceiling[part];
+				} else {
+					c = mdays[leapyear][parts[2]];
+				}
+				if (parts[part] >= c) {
+					if (part == 0) {
+						return LDAP_INVALID_SYNTAX;
+					}
+					parts[part] -= c;
+					parts[part - 1]++;
+					continue;
+				} else if (part != 5) {
+					break;
+				}
 			}
-			if (parts[part] < 0) {
-				parts[part] += c + 1;
-				parts[part - 1]--;
+		} else {
+			/* positive offset to UTC, ie east of Greenwich */
+			parts[4] -= parts[7];
+			parts[5] -= parts[8];
+			for (part = 6; --part >= 0; ) {
+				if (parts[part] < 0) {
+					if (part == 0) {
+						return LDAP_INVALID_SYNTAX;
+					}
+					if (part != 3) {
+						c = ceiling[part];
+					} else {
+						/* make first arg to % non-negative */
+						c = mdays[leapyear][(parts[2] - 1 + 12) % 12];
+					}
+					parts[part] += c;
+					parts[part - 1]--;
+					continue;
+				} else if (part != 5) {
+					break;
+				}
 			}
 		}
-		break;
-	case 0: /* already UTC */
-		break;
 	}
 
-	return LDAP_SUCCESS;
+	return p != e ? LDAP_INVALID_SYNTAX : LDAP_SUCCESS;
 }
 
 #ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
+
+#if 0
 static int
-utcTimeNormalize(
+xutcTimeNormalize(
 	Syntax *syntax,
 	struct berval *val,
 	struct berval *normalized )
 {
 	int parts[9], rc;
 
-	rc = check_time_syntax(val, 1, parts);
+	rc = check_time_syntax(val, 1, parts, NULL);
 	if (rc != LDAP_SUCCESS) {
 		return rc;
 	}
@@ -4118,19 +2474,18 @@ utcTimeNormalize(
 
 	return LDAP_SUCCESS;
 }
-#endif
+#endif /* 0 */
 
-#ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
 static int
 utcTimeValidate(
 	Syntax *syntax,
 	struct berval *in )
 {
 	int parts[9];
-
-	return check_time_syntax(in, 1, parts);
+	return check_time_syntax(in, 1, parts, NULL);
 }
-#endif
+
+#endif /* SUPPORT_OBSOLETE_UTC_SYNTAX */
 
 static int
 generalizedTimeValidate(
@@ -4138,33 +2493,67 @@ generalizedTimeValidate(
 	struct berval *in )
 {
 	int parts[9];
-
-	return check_time_syntax(in, 0, parts);
+	struct berval fraction;
+	return check_time_syntax(in, 0, parts, &fraction);
 }
 
 static int
 generalizedTimeNormalize(
+	slap_mask_t usage,
 	Syntax *syntax,
+	MatchingRule *mr,
 	struct berval *val,
-	struct berval *normalized )
+	struct berval *normalized,
+	void *ctx )
 {
 	int parts[9], rc;
+	unsigned int len;
+	struct berval fraction;
 
-	rc = check_time_syntax(val, 0, parts);
+	rc = check_time_syntax(val, 0, parts, &fraction);
 	if (rc != LDAP_SUCCESS) {
 		return rc;
 	}
 
-	normalized->bv_val = ch_malloc( 16 );
+	len = sizeof("YYYYmmddHHMMSSZ")-1 + fraction.bv_len;
+	normalized->bv_val = sl_malloc( len + 1, ctx );
 	if ( normalized->bv_val == NULL ) {
 		return LBER_ERROR_MEMORY;
 	}
 
-	sprintf( normalized->bv_val, "%02d%02d%02d%02d%02d%02d%02dZ",
+	sprintf( normalized->bv_val, "%02d%02d%02d%02d%02d%02d%02d",
 		parts[0], parts[1], parts[2] + 1, parts[3] + 1,
 		parts[4], parts[5], parts[6] );
-	normalized->bv_len = 15;
+	if ( fraction.bv_len ) {
+		memcpy( normalized->bv_val + sizeof("YYYYmmddHHMMSSZ")-2,
+			fraction.bv_val, fraction.bv_len );
+		normalized->bv_val[sizeof("YYYYmmddHHMMSSZ")-2] = '.';
+	}
+	strcpy( normalized->bv_val + len-1, "Z" );
+	normalized->bv_len = len;
+
+	return LDAP_SUCCESS;
+}
+
+static int
+generalizedTimeOrderingMatch(
+	int *matchp,
+	slap_mask_t flags,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *value,
+	void *assertedValue )
+{
+	struct berval *asserted = (struct berval *) assertedValue;
+	ber_len_t v_len  = value->bv_len;
+	ber_len_t av_len = asserted->bv_len;
+
+	/* ignore trailing 'Z' when comparing */
+	int match = memcmp( value->bv_val, asserted->bv_val,
+		(v_len < av_len ? v_len : av_len) - 1 );
+	if ( match == 0 ) match = v_len - av_len;
 
+	*matchp = match;
 	return LDAP_SUCCESS;
 }
 
@@ -4258,186 +2647,254 @@ bootParameterValidate(
 	return LDAP_SUCCESS;
 }
 
-static struct syntax_defs_rec {
-	char *sd_desc;
+static int
+firstComponentNormalize(
+	slap_mask_t usage,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *val,
+	struct berval *normalized,
+	void *ctx )
+{
+	int rc;
+	struct berval oid;
+	ber_len_t len;
+
+	if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX;
+
+	if( val->bv_val[0] != '(' /*')'*/ &&
+		val->bv_val[0] != '{' /*'}'*/ )
+	{
+		return LDAP_INVALID_SYNTAX;
+	}
+
+	/* trim leading white space */
+	for( len=1;
+		len < val->bv_len && ASCII_SPACE(val->bv_val[len]);
+		len++ )
+	{
+		/* empty */
+	}
+
+	/* grab next word */
+	oid.bv_val = &val->bv_val[len];
+	len = val->bv_len - len;
+	for( oid.bv_len=0;
+		!ASCII_SPACE(oid.bv_val[oid.bv_len]) && oid.bv_len < len;
+		oid.bv_len++ )
+	{
+		/* empty */
+	}
+
+	if( mr == slap_schema.si_mr_objectIdentifierFirstComponentMatch ) {
+		rc = numericoidValidate( NULL, &oid );
+	} else if( mr == slap_schema.si_mr_integerFirstComponentMatch ) {
+		rc = integerValidate( NULL, &oid );
+	} else {
+		rc = LDAP_INVALID_SYNTAX;
+	}
+	
+
+	if( rc == LDAP_SUCCESS ) {
+		ber_dupbv_x( normalized, &oid, ctx );
+	}
+
+	return rc;
+}
+
+
 #define X_BINARY "X-BINARY-TRANSFER-REQUIRED 'TRUE' "
 #define X_NOT_H_R "X-NOT-HUMAN-READABLE 'TRUE' "
-	int sd_flags;
-	slap_syntax_validate_func *sd_validate;
-	slap_syntax_transform_func *sd_normalize;
-	slap_syntax_transform_func *sd_pretty;
-#ifdef SLAPD_BINARY_CONVERSION
-	slap_syntax_transform_func *sd_ber2str;
-	slap_syntax_transform_func *sd_str2ber;
-#endif
-} syntax_defs[] = {
+
+static slap_syntax_defs_rec syntax_defs[] = {
 	{"( 1.3.6.1.4.1.1466.115.121.1.1 DESC 'ACI Item' "
 		X_BINARY X_NOT_H_R ")",
-		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL, NULL},
+		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.2 DESC 'Access Point' " X_NOT_H_R ")",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.3 DESC 'Attribute Type Description' )",
-		0, NULL, NULL, NULL},
+		0, 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},
+		SLAP_SYNTAX_BLOB, blobValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' "
 		X_NOT_H_R ")",
-		SLAP_SYNTAX_BER, berValidate, NULL, NULL},
+		SLAP_SYNTAX_BER, berValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' )",
-		0, bitStringValidate, bitStringNormalize, NULL },
+		0, bitStringValidate, NULL },
 	{"( 1.3.6.1.4.1.1466.115.121.1.7 DESC 'Boolean' )",
-		0, booleanValidate, NULL, NULL},
+		0, booleanValidate, 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},
+		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, certificateValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.9 DESC 'Certificate List' "
 		X_BINARY X_NOT_H_R ")",
-		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, berValidate, NULL, NULL},
+		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, sequenceValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.10 DESC 'Certificate Pair' "
 		X_BINARY X_NOT_H_R ")",
-		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, berValidate, NULL, NULL},
+		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, sequenceValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.11 DESC 'Country String' )",
-		0, countryStringValidate, IA5StringNormalize, NULL},
+		0, countryStringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'Distinguished Name' )",
-		0, dnValidate, dnNormalize2, dnPretty2},
+		0, dnValidate, dnPretty},
 	{"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'Delivery Method' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'Directory String' )",
-		0, UTF8StringValidate, UTF8StringNormalize, NULL},
+		0, UTF8StringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.16 DESC 'DIT Content Rule Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.17 DESC 'DIT Structure Rule Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.19 DESC 'DSA Quality' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.20 DESC 'DSE Type' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.21 DESC 'Enhanced Guide' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.22 DESC 'Facsimile Telephone Number' )",
-		0, printablesStringValidate, telephoneNumberNormalize, NULL},
+		0, printablesStringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.23 DESC 'Fax' " X_NOT_H_R ")",
-		SLAP_SYNTAX_BLOB, NULL, NULL, NULL},
+		SLAP_SYNTAX_BLOB, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.24 DESC 'Generalized Time' )",
-		0, generalizedTimeValidate, generalizedTimeNormalize, NULL},
+		0, generalizedTimeValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.25 DESC 'Guide' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.26 DESC 'IA5 String' )",
-		0, IA5StringValidate, IA5StringNormalize, NULL},
+		0, IA5StringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.27 DESC 'Integer' )",
-		0, integerValidate, integerNormalize, NULL},
+		0, integerValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.28 DESC 'JPEG' " X_NOT_H_R ")",
-		SLAP_SYNTAX_BLOB, blobValidate, NULL, NULL},
+		SLAP_SYNTAX_BLOB, blobValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.29 DESC 'Master And Shadow Access Points' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.30 DESC 'Matching Rule Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.31 DESC 'Matching Rule Use Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.32 DESC 'Mail Preference' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.33 DESC 'MHS OR Address' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'Name And Optional UID' )",
-		0, nameUIDValidate, nameUIDNormalize, NULL},
+		0, nameUIDValidate, nameUIDPretty },
 	{"( 1.3.6.1.4.1.1466.115.121.1.35 DESC 'Name Form Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.36 DESC 'Numeric String' )",
-		0, numericStringValidate, numericStringNormalize, NULL},
+		0, numericStringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.37 DESC 'Object Class Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.38 DESC 'OID' )",
-		0, oidValidate, NULL, NULL},
+		0, numericoidValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.39 DESC 'Other Mailbox' )",
-		0, IA5StringValidate, IA5StringNormalize, NULL},
+		0, IA5StringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.40 DESC 'Octet String' )",
-		0, blobValidate, NULL, NULL},
+		0, blobValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.41 DESC 'Postal Address' )",
-		0, UTF8StringValidate, UTF8StringNormalize, NULL},
+		0, UTF8StringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.42 DESC 'Protocol Information' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.43 DESC 'Presentation Address' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.44 DESC 'Printable String' )",
-		0, printableStringValidate, IA5StringNormalize, NULL},
-	{"( 1.3.6.1.4.1.1466.115.121.1.45 DESC 'SubtreeSpecification' "
-		X_BINARY X_NOT_H_R ")",
-		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, NULL, NULL, NULL},
+		0, printableStringValidate, NULL},
+	{"( 1.3.6.1.4.1.1466.115.121.1.45 DESC 'SubtreeSpecification' )",
+#define subtreeSpecificationValidate UTF8StringValidate /* FIXME */
+		0, subtreeSpecificationValidate, 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},
+		SLAP_SYNTAX_BINARY|SLAP_SYNTAX_BER, berValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.50 DESC 'Telephone Number' )",
-		0, printableStringValidate, telephoneNumberNormalize, NULL},
+		0, printableStringValidate, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.51 DESC 'Teletex Terminal Identifier' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.52 DESC 'Telex Number' )",
-		0, printablesStringValidate, IA5StringNormalize, NULL},
+		0, printablesStringValidate, NULL},
 #ifdef SUPPORT_OBSOLETE_UTC_SYNTAX
 	{"( 1.3.6.1.4.1.1466.115.121.1.53 DESC 'UTC Time' )",
-		0, utcTimeValidate, utcTimeNormalize, NULL},
+		0, utcTimeValidate, NULL},
 #endif
 	{"( 1.3.6.1.4.1.1466.115.121.1.54 DESC 'LDAP Syntax Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.55 DESC 'Modify Rights' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.56 DESC 'LDAP Schema Definition' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.57 DESC 'LDAP Schema Description' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 	{"( 1.3.6.1.4.1.1466.115.121.1.58 DESC 'Substring Assertion' )",
-		0, NULL, NULL, NULL},
+		0, NULL, NULL},
 
 	/* RFC 2307 NIS Syntaxes */
 	{"( 1.3.6.1.1.1.0.0  DESC 'RFC2307 NIS Netgroup Triple' )",
-		0, nisNetgroupTripleValidate, NULL, NULL},
+		0, nisNetgroupTripleValidate, NULL},
 	{"( 1.3.6.1.1.1.0.1  DESC 'RFC2307 Boot Parameter' )",
-		0, bootParameterValidate, NULL, NULL},
+		0, bootParameterValidate, 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
+	/* From PKIX *//* This OID is not published yet. */
+	{"( 1.2.826.0.1.3344810.7.1 DESC 'Certificate Serial Number and Issuer' )",
+		SLAP_SYNTAX_HIDE,
+		serialNumberAndIssuerValidate,
+		serialNumberAndIssuerPretty},
 
-	/* OpenLDAP Experimental Syntaxes */
 #ifdef SLAPD_ACI_ENABLED
+	/* OpenLDAP Experimental Syntaxes */
 	{"( 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},
+		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},
+		SLAP_SYNTAX_HIDE, NULL, NULL},
 #endif
 
+	{"( 1.3.6.1.4.1.4203.666.2.6 DESC 'UUID' )",
+		SLAP_SYNTAX_HIDE, UUIDValidate, NULL},
+
 	/* OpenLDAP Void Syntax */
 	{"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' )" ,
-		SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
-	{NULL, 0, NULL, NULL, NULL}
+		SLAP_SYNTAX_HIDE, inValidate, NULL},
+	{NULL, 0, NULL, NULL}
+};
+
+char *certificateExactMatchSyntaxes[] = {
+	"1.3.6.1.4.1.1466.115.121.1.8" /* certificate */,
+	NULL
+};
+char *directoryStringSyntaxes[] = {
+	"1.3.6.1.4.1.1466.115.121.1.44" /* printableString */,
+	NULL
+};
+char *integerFirstComponentMatchSyntaxes[] = {
+	"1.3.6.1.4.1.1466.115.121.1.27" /* INTEGER */,
+	"1.3.6.1.4.1.1466.115.121.1.17" /* ditStructureRuleDescription */,
+	NULL
+};
+char *objectIdentifierFirstComponentMatchSyntaxes[] = {
+	"1.3.6.1.4.1.1466.115.121.1.38" /* OID */,
+	"1.3.6.1.4.1.1466.115.121.1.3"  /* attributeTypeDescription */,
+	"1.3.6.1.4.1.1466.115.121.1.16" /* ditContentRuleDescription */,
+	"1.3.6.1.4.1.1466.115.121.1.54" /* ldapSyntaxDescription */,
+	"1.3.6.1.4.1.1466.115.121.1.30" /* matchingRuleDescription */,
+	"1.3.6.1.4.1.1466.115.121.1.31" /* matchingRuleUseDescription */,
+	"1.3.6.1.4.1.1466.115.121.1.35" /* nameFormDescription */,
+	"1.3.6.1.4.1.1466.115.121.1.37" /* objectClassDescription */,
+	NULL
 };
 
 /*
  * Other matching rules in X.520 that we do not use (yet):
  *
  * 2.5.13.9		numericStringOrderingMatch
- * 2.5.13.18	octetStringOrderingMatch
- * 2.5.13.19	octetStringSubstringsMatch
  * 2.5.13.25	uTCTimeMatch
  * 2.5.13.26	uTCTimeOrderingMatch
  * 2.5.13.31	directoryStringFirstComponentMatch
  * 2.5.13.32	wordMatch
  * 2.5.13.33	keywordMatch
- * 2.5.13.35	certificateMatch
  * 2.5.13.36	certificatePairExactMatch
  * 2.5.13.37	certificatePairMatch
  * 2.5.13.38	certificateListExactMatch
@@ -4448,37 +2905,23 @@ static struct syntax_defs_rec {
  * 2.5.13.43	readerAndKeyIDMatch
  * 2.5.13.44	attributeIntegrityMatch
  */
-static struct mrule_defs_rec {
-	char *						mrd_desc;
-	slap_mask_t					mrd_usage;
-	slap_mr_convert_func *		mrd_convert;
-	slap_mr_normalize_func *	mrd_normalize;
-	slap_mr_match_func *		mrd_match;
-	slap_mr_indexer_func *		mrd_indexer;
-	slap_mr_filter_func *		mrd_filter;
-
-	char *						mrd_associated;
-} mrule_defs[] = {
+static slap_mrule_defs_rec mrule_defs[] = {
 	/*
 	 * EQUALITY matching rules must be listed after associated APPROX
 	 * matching rules.  So, we list all APPROX matching rules first.
 	 */
 	{"( " directoryStringApproxMatchOID " NAME 'directoryStringApproxMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-		SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT,
-		NULL, NULL,
-		directoryStringApproxMatch,
-		directoryStringApproxIndexer, 
-		directoryStringApproxFilter,
+		SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT, NULL,
+		NULL, NULL, directoryStringApproxMatch,
+		directoryStringApproxIndexer, directoryStringApproxFilter,
 		NULL},
 
 	{"( " IA5StringApproxMatchOID " NAME 'IA5StringApproxMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
-		SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT,
-		NULL, NULL,
-		IA5StringApproxMatch,
-		IA5StringApproxIndexer, 
-		IA5StringApproxFilter,
+		SLAP_MR_HIDE | SLAP_MR_EQUALITY_APPROX | SLAP_MR_EXT, NULL,
+		NULL, NULL, IA5StringApproxMatch,
+		IA5StringApproxIndexer, IA5StringApproxFilter,
 		NULL},
 
 	/*
@@ -4487,297 +2930,309 @@ static struct mrule_defs_rec {
 	
 	{"( 2.5.13.0 NAME 'objectIdentifierMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		objectIdentifierMatch, caseIgnoreIA5Indexer, caseIgnoreIA5Filter,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
 
 	{"( 2.5.13.1 NAME 'distinguishedNameMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		dnMatch, dnIndexer, dnFilter,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, dnNormalize, dnMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
 
 	{"( 2.5.13.2 NAME 'caseIgnoreMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
-		NULL, NULL,
-		caseIgnoreMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, directoryStringSyntaxes,
+		NULL, UTF8StringNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
 		directoryStringApproxMatchOID },
 
 	{"( 2.5.13.3 NAME 'caseIgnoreOrderingMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-		SLAP_MR_ORDERING,
+		SLAP_MR_ORDERING, directoryStringSyntaxes,
+		NULL, UTF8StringNormalize, octetStringOrderingMatch,
 		NULL, NULL,
-		caseIgnoreOrderingMatch, NULL, NULL,
-		NULL},
+		"caseIgnoreMatch" },
 
 	{"( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-		SLAP_MR_SUBSTR | SLAP_MR_EXT,
-		NULL, NULL,
-		caseExactIgnoreSubstringsMatch,
-		caseExactIgnoreSubstringsIndexer,
-		caseExactIgnoreSubstringsFilter,
-		NULL},
+		SLAP_MR_SUBSTR, NULL,
+		NULL, UTF8StringNormalize, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		"caseIgnoreMatch" },
 
 	{"( 2.5.13.5 NAME 'caseExactMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		caseExactMatch, caseExactIgnoreIndexer, caseExactIgnoreFilter,
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, directoryStringSyntaxes,
+		NULL, UTF8StringNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
 		directoryStringApproxMatchOID },
 
 	{"( 2.5.13.6 NAME 'caseExactOrderingMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-		SLAP_MR_ORDERING,
+		SLAP_MR_ORDERING, directoryStringSyntaxes,
+		NULL, UTF8StringNormalize, octetStringOrderingMatch,
 		NULL, NULL,
-		caseExactOrderingMatch, NULL, NULL,
-		NULL},
+		"caseExactMatch" },
 
 	{"( 2.5.13.7 NAME 'caseExactSubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-		SLAP_MR_SUBSTR | SLAP_MR_EXT,
-		NULL, NULL,
-		caseExactIgnoreSubstringsMatch,
-		caseExactIgnoreSubstringsIndexer,
-		caseExactIgnoreSubstringsFilter,
-		NULL},
+		SLAP_MR_SUBSTR, directoryStringSyntaxes,
+		NULL, UTF8StringNormalize, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		"caseExactMatch" },
 
 	{"( 2.5.13.8 NAME 'numericStringMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
-		NULL, NULL,
-		caseIgnoreIA5Match,
-		caseIgnoreIA5Indexer,
-		caseIgnoreIA5Filter,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, numericStringNormalize, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		NULL },
 
 	{"( 2.5.13.10 NAME 'numericStringSubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-		SLAP_MR_SUBSTR | SLAP_MR_EXT,
-		NULL, NULL,
-		caseIgnoreIA5SubstringsMatch,
-		caseIgnoreIA5SubstringsIndexer,
-		caseIgnoreIA5SubstringsFilter,
-		NULL},
+		SLAP_MR_SUBSTR, NULL,
+		NULL, numericStringNormalize, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		"numericStringMatch" },
 
 	{"( 2.5.13.11 NAME 'caseIgnoreListMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
-		NULL, NULL,
-		caseIgnoreListMatch, NULL, NULL,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, NULL, NULL, NULL, NULL },
 
 	{"( 2.5.13.12 NAME 'caseIgnoreListSubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-		SLAP_MR_SUBSTR | SLAP_MR_EXT,
-		NULL, NULL,
-		caseIgnoreListSubstringsMatch, NULL, NULL,
-		NULL},
+		SLAP_MR_SUBSTR, NULL,
+		NULL, NULL, NULL, NULL, NULL,
+		"caseIgnoreListMatch" },
 
 	{"( 2.5.13.13 NAME 'booleanMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		booleanMatch, NULL, NULL,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, booleanMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
 
 	{"( 2.5.13.14 NAME 'integerMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		integerMatch, integerIndexer, integerFilter,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, integerMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
 
 	{"( 2.5.13.15 NAME 'integerOrderingMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
-		SLAP_MR_ORDERING,
+		SLAP_MR_ORDERING, NULL,
+		NULL, NULL, integerMatch,
 		NULL, NULL,
-		integerOrderingMatch, NULL, NULL,
-		NULL},
+		"integerMatch" },
 
 	{"( 2.5.13.16 NAME 'bitStringMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		bitStringMatch, bitStringIndexer, bitStringFilter,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
 
 	{"( 2.5.13.17 NAME 'octetStringMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
+
+	{"( 2.5.13.18 NAME 'octetStringOrderingMatch' "
+		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
+		SLAP_MR_ORDERING, NULL,
+		NULL, NULL, octetStringOrderingMatch,
 		NULL, NULL,
-		octetStringMatch, octetStringIndexer, octetStringFilter,
-		NULL},
+		"octetStringMatch" },
+
+	{"( 2.5.13.19 NAME 'octetStringSubstringsMatch' "
+		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
+		SLAP_MR_SUBSTR, NULL,
+		NULL, NULL, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		"octetStringMatch" },
 
 	{"( 2.5.13.20 NAME 'telephoneNumberMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
-		NULL, NULL,
-		telephoneNumberMatch,
-		telephoneNumberIndexer,
-		telephoneNumberFilter,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL,
+		telephoneNumberNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
 
 	{"( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-		SLAP_MR_SUBSTR | SLAP_MR_EXT,
-		NULL, NULL,
-		telephoneNumberSubstringsMatch,
-		telephoneNumberSubstringsIndexer,
-		telephoneNumberSubstringsFilter,
-		NULL},
+		SLAP_MR_SUBSTR, NULL,
+		NULL, telephoneNumberNormalize, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		"telephoneNumberMatch" },
 
 	{"( 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,
-		NULL, NULL, NULL,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, NULL, NULL, NULL, NULL },
 
 	{"( 2.5.13.23 NAME 'uniqueMemberMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, uniqueMemberNormalize, uniqueMemberMatch,
 		NULL, NULL,
-		uniqueMemberMatch, NULL, NULL,
-		NULL},
+		NULL },
 
 	{"( 2.5.13.24 NAME 'protocolInformationMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		protocolInformationMatch, NULL, NULL,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, NULL, NULL, NULL, NULL, NULL },
 
 	{"( 2.5.13.27 NAME 'generalizedTimeMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, generalizedTimeNormalize, octetStringMatch,
 		NULL, NULL,
-		generalizedTimeMatch, NULL, NULL,
-		NULL},
+		NULL },
 
 	{"( 2.5.13.28 NAME 'generalizedTimeOrderingMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )",
-		SLAP_MR_ORDERING,
+		SLAP_MR_ORDERING, NULL,
+		NULL, generalizedTimeNormalize, generalizedTimeOrderingMatch,
 		NULL, NULL,
-		generalizedTimeOrderingMatch, NULL, NULL,
-		NULL},
+		"generalizedTimeMatch" },
 
 	{"( 2.5.13.29 NAME 'integerFirstComponentMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
 		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		integerFirstComponentMatch, NULL, NULL,
-		NULL},
+			integerFirstComponentMatchSyntaxes,
+		NULL, firstComponentNormalize, integerMatch,
+		octetStringIndexer, octetStringFilter,
+		NULL },
 
 	{"( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )",
 		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		objectIdentifierFirstComponentMatch, NULL, NULL,
-		NULL},
+			objectIdentifierFirstComponentMatchSyntaxes,
+		NULL, firstComponentNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
+		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,
-		certificateExactConvert, NULL,
-		certificateExactMatch,
-		certificateExactIndexer, certificateExactFilter,
-		NULL},
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, certificateExactMatchSyntaxes,
+#ifdef HAVE_TLS
+		NULL, certificateExactNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
+#else
+		NULL, NULL, NULL, NULL, NULL,
+#endif
+		NULL },
+
+	{"( 2.5.13.35 NAME 'certificateMatch' "
+		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )",
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+#ifdef HAVE_TLS
+		NULL, NULL, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
+#else
+		NULL, NULL, NULL, NULL, NULL,
 #endif
+		NULL },
 
 	{"( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT,
-		NULL, NULL,
-		caseExactIA5Match, caseExactIA5Indexer, caseExactIA5Filter,
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, IA5StringNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
 		IA5StringApproxMatchOID },
 
 	{"( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
-		SLAP_MR_EQUALITY | SLAP_MR_EXT | SLAP_MR_DN_FOLD,
-		NULL, NULL,
-		caseIgnoreIA5Match, caseIgnoreIA5Indexer, caseIgnoreIA5Filter,
+		SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
+		NULL, IA5StringNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
 		IA5StringApproxMatchOID },
 
 	{"( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
-		SLAP_MR_SUBSTR,
-		NULL, NULL,
-		caseIgnoreIA5SubstringsMatch,
-		caseIgnoreIA5SubstringsIndexer,
-		caseIgnoreIA5SubstringsFilter,
-		NULL},
+		SLAP_MR_SUBSTR, NULL,
+		NULL, IA5StringNormalize, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		"caseIgnoreIA5Match" },
 
 	{"( 1.3.6.1.4.1.4203.1.2.1 NAME 'caseExactIA5SubstringsMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
-		SLAP_MR_SUBSTR,
-		NULL, NULL,
-		caseExactIA5SubstringsMatch,
-		caseExactIA5SubstringsIndexer,
-		caseExactIA5SubstringsFilter,
-		NULL},
+		SLAP_MR_SUBSTR, NULL,
+		NULL, IA5StringNormalize, octetStringSubstringsMatch,
+		octetStringSubstringsIndexer, octetStringSubstringsFilter,
+		"caseExactIA5Match" },
 
 #ifdef SLAPD_AUTHPASSWD
 	/* needs updating */
 	{"( 1.3.6.1.4.1.4203.666.4.1 NAME 'authPasswordMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
-		SLAP_MR_EQUALITY,
+		SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL,
+		NULL, NULL, authPasswordMatch,
 		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,
+		SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL,
+		NULL, NULL, OpenLDAPaciMatch,
 		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 )",
-		SLAP_MR_EXT,
+		SLAP_MR_EXT, NULL,
+		NULL, NULL, integerBitAndMatch,
 		NULL, NULL,
-		integerBitAndMatch, NULL, NULL,
-		NULL},
+		"integerMatch" },
 
 	{"( 1.2.840.113556.1.4.804 NAME 'integerBitOrMatch' "
 		"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
-		SLAP_MR_EXT,
+		SLAP_MR_EXT, NULL,
+		NULL, NULL, integerBitOrMatch,
 		NULL, NULL,
-		integerBitOrMatch, NULL, NULL,
+		"integerMatch" },
+
+	{"( 1.3.6.1.4.1.4203.666.4.6 NAME 'UUIDMatch' "
+		"SYNTAX 1.3.6.1.4.1.4203.666.2.6 )",
+		SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL,
+		NULL, UUIDNormalize, octetStringMatch,
+		octetStringIndexer, octetStringFilter,
 		NULL},
 
-	{NULL, SLAP_MR_NONE, NULL, NULL, NULL, NULL}
+	{"( 1.3.6.1.4.1.4203.666.4.7 NAME 'UUIDOrderingMatch' "
+		"SYNTAX 1.3.6.1.4.1.4203.666.2.6 )",
+		SLAP_MR_HIDE | SLAP_MR_ORDERING, NULL,
+		NULL, UUIDNormalize, octetStringOrderingMatch,
+		octetStringIndexer, octetStringFilter,
+		"UUIDMatch"},
+
+	{NULL, SLAP_MR_NONE, NULL,
+		NULL, NULL, NULL, NULL, NULL,
+		NULL }
 };
 
 int
 slap_schema_init( void )
 {
 	int		res;
-	int		i = 0;
+	int		i;
 
 	/* we should only be called once (from main) */
 	assert( schema_init_done == 0 );
 
 	for ( i=0; syntax_defs[i].sd_desc != NULL; i++ ) {
-		res = register_syntax( syntax_defs[i].sd_desc,
-			syntax_defs[i].sd_flags,
-			syntax_defs[i].sd_validate,
-			syntax_defs[i].sd_normalize,
-			syntax_defs[i].sd_pretty
-#ifdef SLAPD_BINARY_CONVERSION
-			,
-			syntax_defs[i].sd_ber2str,
-			syntax_defs[i].sd_str2ber
-#endif
-		);
+		res = register_syntax( &syntax_defs[i] );
 
 		if ( res ) {
 			fprintf( stderr, "slap_schema_init: Error registering syntax %s\n",
@@ -4787,22 +3242,16 @@ slap_schema_init( void )
 	}
 
 	for ( i=0; mrule_defs[i].mrd_desc != NULL; i++ ) {
-		if( mrule_defs[i].mrd_usage == SLAP_MR_NONE ) {
+		if( mrule_defs[i].mrd_usage == SLAP_MR_NONE &&
+			mrule_defs[i].mrd_compat_syntaxes == NULL )
+		{
 			fprintf( stderr,
-				"slap_schema_init: Ingoring unusable matching rule %s\n",
+				"slap_schema_init: Ignoring unusable matching rule %s\n",
 				 mrule_defs[i].mrd_desc );
 			continue;
 		}
 
-		res = register_matching_rule(
-			mrule_defs[i].mrd_desc,
-			mrule_defs[i].mrd_usage,
-			mrule_defs[i].mrd_convert,
-			mrule_defs[i].mrd_normalize,
-			mrule_defs[i].mrd_match,
-			mrule_defs[i].mrd_indexer,
-			mrule_defs[i].mrd_filter,
-			mrule_defs[i].mrd_associated );
+		res = register_matching_rule( &mrule_defs[i] );
 
 		if ( res ) {
 			fprintf( stderr,
@@ -4812,9 +3261,6 @@ slap_schema_init( void )
 		}
 	}
 
-	for ( i=0; i < (int)(sizeof(mr_ptr)/sizeof(mr_ptr[0])); i++ )
-		*mr_ptr[i].mr = mr_find( mr_ptr[i].oid );
-
 	res = slap_schema_load();
 	schema_init_done = 1;
 	return res;
@@ -4823,12 +3269,10 @@ slap_schema_init( void )
 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();
+	mru_destroy();
 	syn_destroy();
 }