X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdn.c;h=e6d268ac781cf49e0a2bacbe0eed8e3656ab7b29;hb=22df3f94e404e738640b6dc90eecef7e66c90966;hp=449808b3d14ca5a2dab225d971612b9f16796906;hpb=70e7d58c7d075f89650e6bf2c60fffa25ecbcfac;p=openldap

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 449808b3d1..e6d268ac78 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1,8 +1,27 @@
 /* dn.c - routines for dealing with distinguished names */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -14,11 +33,9 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "ldap_pvt.h"
-
 #include "slap.h"
-
-#define SLAP_LDAPDN_PRETTY 0x1
+#include "ldap_pvt.h" /* must be after slap.h, to get ldap_bv2dn_x() & co */
+#include "lutil.h"
 
 /*
  * The DN syntax-related functions take advantage of the dn representation
@@ -42,7 +59,7 @@
  * structural representation of a distinguished name.
  */
 static int
-LDAPDN_validate( LDAPDN *dn )
+LDAPDN_validate( LDAPDN dn )
 {
 	int 		iRDN;
 	int 		rc;
@@ -50,13 +67,13 @@ LDAPDN_validate( LDAPDN *dn )
 	assert( dn );
 
 	for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
-		LDAPRDN		*rdn = dn[ iRDN ][ 0 ];
+		LDAPRDN		rdn = dn[ iRDN ];
 		int		iAVA;
 
 		assert( rdn );
 
 		for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
-			LDAPAVA			*ava = rdn[ iAVA ][ 0 ];
+			LDAPAVA			*ava = rdn[ iAVA ];
 			AttributeDescription	*ad;
 			slap_syntax_validate_func *validate = NULL;
 
@@ -65,7 +82,7 @@ LDAPDN_validate( LDAPDN *dn )
 			if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
 				const char	*text = NULL;
 
-				rc = slap_bv2ad( ava->la_attr, &ad, &text );
+				rc = slap_bv2ad( &ava->la_attr, &ad, &text );
 				if ( rc != LDAP_SUCCESS ) {
 					return LDAP_INVALID_SYNTAX;
 				}
@@ -76,8 +93,7 @@ LDAPDN_validate( LDAPDN *dn )
 			/* 
 			 * Replace attr oid/name with the canonical name
 			 */
-			ber_bvfree( ava->la_attr );
-			ava->la_attr = ber_bvdup( &ad->ad_cname );
+			ava->la_attr = ad->ad_cname;
 
 			validate = ad->ad_type->sat_syntax->ssyn_validate;
 
@@ -86,7 +102,7 @@ LDAPDN_validate( LDAPDN *dn )
 			 	 * validate value by validate function
 				 */
 				rc = ( *validate )( ad->ad_type->sat_syntax,
-					ava->la_value );
+					&ava->la_value );
 			
 				if ( rc != LDAP_SUCCESS ) {
 					return LDAP_INVALID_SYNTAX;
@@ -107,30 +123,35 @@ dnValidate(
 	struct berval *in )
 {
 	int		rc;
-	LDAPDN		*dn = NULL;
+	LDAPDN		dn = NULL;
 
 	assert( in );
 
 	if ( in->bv_len == 0 ) {
-		return( LDAP_SUCCESS );
+		return LDAP_SUCCESS;
+
+	} else if ( in->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		return LDAP_INVALID_SYNTAX;
 	}
 
-	rc = ldap_str2dn( in->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+	rc = ldap_bv2dn( in, &dn, LDAP_DN_FORMAT_LDAP );
+	if ( rc != LDAP_SUCCESS ) {
+		return LDAP_INVALID_SYNTAX;
+	}
+
+	assert( strlen( in->bv_val ) == in->bv_len );
 
 	/*
 	 * Schema-aware validate
 	 */
-	if ( rc == LDAP_SUCCESS ) {
-		rc = LDAPDN_validate( dn );
-	}
-	
+	rc = LDAPDN_validate( dn );
 	ldap_dnfree( dn );
-	
+
 	if ( rc != LDAP_SUCCESS ) {
-		return( LDAP_INVALID_SYNTAX );
+		return LDAP_INVALID_SYNTAX;
 	}
 
-	return( LDAP_SUCCESS );
+	return LDAP_SUCCESS;
 }
 
 /*
@@ -141,25 +162,28 @@ dnValidate(
  * (use memcmp, which implies alphabetical order in case of IA5 value;
  * this should guarantee the repeatability of the operation).
  *
+ * Note: the sorting can be slightly improved by sorting first
+ * by attribute type length, then by alphabetical order.
+ *
  * uses a linear search; should be fine since the number of AVAs in
  * a RDN should be limited.
  */
 static void
-AVA_Sort( LDAPRDN *rdn, int iAVA )
+AVA_Sort( LDAPRDN rdn, int iAVA )
 {
 	int		i;
-	LDAPAVA		*ava_in = rdn[ iAVA ][ 0 ];
+	LDAPAVA		*ava_in = rdn[ iAVA ];
 
 	assert( rdn );
 	assert( ava_in );
 	
 	for ( i = 0; i < iAVA; i++ ) {
-		LDAPAVA		*ava = rdn[ i ][ 0 ];
+		LDAPAVA		*ava = rdn[ i ];
 		int		a, j;
 
 		assert( ava );
 
-		a = strcmp( ava_in->la_attr->bv_val, ava->la_attr->bv_val );
+		a = strcmp( ava_in->la_attr.bv_val, ava->la_attr.bv_val );
 
 		if ( a > 0 ) {
 			break;
@@ -168,12 +192,12 @@ AVA_Sort( LDAPRDN *rdn, int iAVA )
 		while ( a == 0 ) {
 			int		v, d;
 
-			d = ava_in->la_value->bv_len - ava->la_value->bv_len;
+			d = ava_in->la_value.bv_len - ava->la_value.bv_len;
 
-			v = memcmp( ava_in->la_value->bv_val, 
-					ava->la_value->bv_val,
-					d <= 0 ? ava_in->la_value->bv_len 
-						: ava->la_value->bv_len );
+			v = memcmp( ava_in->la_value.bv_val, 
+					ava->la_value.bv_val,
+					d <= 0 ? ava_in->la_value.bv_len 
+						: ava->la_value.bv_len );
 
 			if ( v == 0 && d != 0 ) {
 				v = d;
@@ -193,18 +217,18 @@ AVA_Sort( LDAPRDN *rdn, int iAVA )
 				return;
 			}
 
-			ava = rdn[ i ][ 0 ];
-			a = strcmp( ava_in->la_value->bv_val, 
-					ava->la_value->bv_val );
+			ava = rdn[ i ];
+			a = strcmp( ava_in->la_attr.bv_val, 
+					ava->la_attr.bv_val );
 		}
 
 		/*
 		 * move ahead
 		 */
 		for ( j = iAVA; j > i; j-- ) {
-			rdn[ j ][ 0 ] = rdn[ j - 1 ][ 0 ];
+			rdn[ j ] = rdn[ j - 1 ];
 		}
-		rdn[ i ][ 0 ] = ava_in;
+		rdn[ i ] = ava_in;
 
 		return;
 	}
@@ -215,7 +239,7 @@ AVA_Sort( LDAPRDN *rdn, int iAVA )
  * structural representation of a distinguished name.
  */
 static int
-LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
+LDAPDN_rewrite( LDAPDN dn, unsigned flags, void *ctx )
 {
 	int 		iRDN;
 	int 		rc;
@@ -223,173 +247,215 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
 	assert( dn );
 
 	for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
-		LDAPRDN		*rdn = dn[ iRDN ][ 0 ];
+		LDAPRDN		rdn = dn[ iRDN ];
 		int		iAVA;
 
 		assert( rdn );
 
 		for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
-			LDAPAVA			*ava = rdn[ iAVA ][ 0 ];
+			LDAPAVA			*ava = rdn[ iAVA ];
 			AttributeDescription	*ad;
+			slap_syntax_validate_func *validf = NULL;
+			slap_mr_normalize_func *normf = NULL;
 			slap_syntax_transform_func *transf = NULL;
-			MatchingRule *mr;
-			struct berval		*bv = NULL;
+			MatchingRule *mr = NULL;
+			struct berval		bv = BER_BVNULL;
+			int			do_sort = 0;
 
 			assert( ava );
 
 			if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
 				const char	*text = NULL;
 
-				rc = slap_bv2ad( ava->la_attr, &ad, &text );
+				rc = slap_bv2ad( &ava->la_attr, &ad, &text );
 				if ( rc != LDAP_SUCCESS ) {
 					return LDAP_INVALID_SYNTAX;
 				}
 				
 				ava->la_private = ( void * )ad;
+				do_sort = 1;
 			}
 
 			/* 
 			 * Replace attr oid/name with the canonical name
 			 */
-			ber_bvfree( ava->la_attr );
-			ava->la_attr = ber_bvdup( &ad->ad_cname );
+			ava->la_attr = ad->ad_cname;
+
+			if( ava->la_flags & LDAP_AVA_BINARY ) {
+				if( ava->la_value.bv_len == 0 ) {
+					/* BER encoding is empty */
+					return LDAP_INVALID_SYNTAX;
+				}
 
-			if( flags & SLAP_LDAPDN_PRETTY ) {
+				/* AVA is binary encoded, don't muck with it */
+			} else if( flags & SLAP_LDAPDN_PRETTY ) {
 				transf = ad->ad_type->sat_syntax->ssyn_pretty;
-				mr = NULL;
-			} else {
-				transf = ad->ad_type->sat_syntax->ssyn_normalize;
+				if( !transf ) {
+					validf = ad->ad_type->sat_syntax->ssyn_validate;
+				}
+			} else { /* normalization */
+				validf = ad->ad_type->sat_syntax->ssyn_validate;
 				mr = ad->ad_type->sat_equality;
+				if( mr ) normf = mr->smr_normalize;
+			}
+
+			if ( validf ) {
+				/* validate value before normalization */
+				rc = ( *validf )( ad->ad_type->sat_syntax,
+					ava->la_value.bv_len
+						? &ava->la_value
+						: (struct berval *) &slap_empty_bv );
+
+				if ( rc != LDAP_SUCCESS ) {
+					return LDAP_INVALID_SYNTAX;
+				}
 			}
 
 			if ( transf ) {
 				/*
-			 	 * transform value by normalize/pretty function
+			 	 * transform value by pretty function
+				 *	if value is empty, use empty_bv
 				 */
 				rc = ( *transf )( ad->ad_type->sat_syntax,
-					ava->la_value, &bv );
+					ava->la_value.bv_len
+						? &ava->la_value
+						: (struct berval *) &slap_empty_bv,
+					&bv, ctx );
 			
 				if ( rc != LDAP_SUCCESS ) {
 					return LDAP_INVALID_SYNTAX;
 				}
 			}
 
-			if( mr && ( mr->smr_usage & SLAP_MR_DN_FOLD ) ) {
-				struct berval *s = bv;
-
-				bv = ber_bvstr( UTF8normalize( bv ? bv : ava->la_value, 
-					UTF8_CASEFOLD ) );
-
-				ber_bvfree( s );
+			if ( normf ) {
+				/*
+			 	 * normalize value
+				 *	if value is empty, use empty_bv
+				 */
+				rc = ( *normf )(
+					SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+					ad->ad_type->sat_syntax,
+					mr,
+					ava->la_value.bv_len
+						? &ava->la_value
+						: (struct berval *) &slap_empty_bv,
+					&bv, ctx );
+			
+				if ( rc != LDAP_SUCCESS ) {
+					return LDAP_INVALID_SYNTAX;
+				}
 			}
 
-			if( bv ) {
-				ber_bvfree( ava->la_value );
+
+			if( bv.bv_val ) {
+				if ( ava->la_flags & LDAP_AVA_FREE_VALUE )
+					ber_memfree_x( ava->la_value.bv_val, ctx );
 				ava->la_value = bv;
+				ava->la_flags |= LDAP_AVA_FREE_VALUE;
 			}
 
-			AVA_Sort( rdn, iAVA );
+			if( do_sort ) AVA_Sort( rdn, iAVA );
 		}
 	}
 
 	return LDAP_SUCCESS;
 }
 
-/*
- * dn normalize routine
- */
 int
 dnNormalize(
-	Syntax *syntax,
-	struct berval *val,
-	struct berval **normalized )
+    slap_mask_t use,
+    Syntax *syntax,
+    MatchingRule *mr,
+    struct berval *val,
+    struct berval *out,
+    void *ctx)
 {
-	struct berval *out = NULL;
-
-	Debug( LDAP_DEBUG_TRACE, ">>> dnNormalize: <%s>\n", val->bv_val, 0, 0 );
-
 	assert( val );
-	assert( normalized );
+	assert( out );
 
-	assert( *normalized == NULL );
+	Debug( LDAP_DEBUG_TRACE, ">>> dnNormalize: <%s>\n", val->bv_val, 0, 0 );
 
 	if ( val->bv_len != 0 ) {
-		LDAPDN		*dn = NULL;
-		char		*dn_out = NULL;
+		LDAPDN		dn = NULL;
 		int		rc;
 
 		/*
 		 * Go to structural representation
 		 */
-		rc = ldap_str2dn( val->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+		rc = ldap_bv2dn_x( val, &dn, LDAP_DN_FORMAT_LDAP, ctx );
 		if ( rc != LDAP_SUCCESS ) {
 			return LDAP_INVALID_SYNTAX;
 		}
 
+		assert( strlen( val->bv_val ) == val->bv_len );
+
 		/*
 		 * Schema-aware rewrite
 		 */
-		if ( LDAPDN_rewrite( dn, 0 ) != LDAP_SUCCESS ) {
-			ldap_dnfree( dn );
+		if ( LDAPDN_rewrite( dn, 0, ctx ) != LDAP_SUCCESS ) {
+			ldap_dnfree_x( dn, ctx );
 			return LDAP_INVALID_SYNTAX;
 		}
 
 		/*
 		 * Back to string representation
 		 */
-		rc = ldap_dn2str( dn, &dn_out, LDAP_DN_FORMAT_LDAPV3 );
+		rc = ldap_dn2bv_x( dn, out,
+			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
 
-		ldap_dnfree( dn );
+		ldap_dnfree_x( dn, ctx );
 
 		if ( rc != LDAP_SUCCESS ) {
 			return LDAP_INVALID_SYNTAX;
 		}
-
-		out = ber_bvstr( dn_out );
-
 	} else {
-		out = ber_bvdup( val );
+		ber_dupbv_x( out, val, ctx );
 	}
 
 	Debug( LDAP_DEBUG_TRACE, "<<< dnNormalize: <%s>\n", out->bv_val, 0, 0 );
 
-	*normalized = out;
 	return LDAP_SUCCESS;
 }
 
-/*
- * dn "pretty"ing routine
- */
 int
 dnPretty(
 	Syntax *syntax,
 	struct berval *val,
-	struct berval **pretty)
+	struct berval *out,
+	void *ctx)
 {
-	struct berval *out = NULL;
+	assert( val );
+	assert( out );
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
+#endif
 
-	assert( val );
-	assert( pretty );
-	assert( *pretty == NULL );
+	if ( val->bv_len == 0 ) {
+		ber_dupbv_x( out, val, ctx );
 
-	if ( val->bv_len != 0 ) {
-		LDAPDN		*dn = NULL;
-		char		*dn_out = NULL;
+	} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		return LDAP_INVALID_SYNTAX;
+
+	} else {
+		LDAPDN		dn = NULL;
 		int		rc;
 
 		/* FIXME: should be liberal in what we accept */
-		rc = ldap_str2dn( val->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+		rc = ldap_bv2dn_x( val, &dn, LDAP_DN_FORMAT_LDAP, ctx );
 		if ( rc != LDAP_SUCCESS ) {
 			return LDAP_INVALID_SYNTAX;
 		}
 
+		assert( strlen( val->bv_val ) == val->bv_len );
+
 		/*
 		 * Schema-aware rewrite
 		 */
-		if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY ) != LDAP_SUCCESS ) {
-			ldap_dnfree( dn );
+		if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY, ctx ) != LDAP_SUCCESS ) {
+			ldap_dnfree_x( dn, ctx );
 			return LDAP_INVALID_SYNTAX;
 		}
 
@@ -397,255 +463,284 @@ dnPretty(
 		/* RE: the default is the form that is used as
 		 * an internal representation; the pretty form
 		 * is a variant */
-		rc = ldap_dn2str( dn, &dn_out,
-			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
+		rc = ldap_dn2bv_x( dn, out,
+			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
 
-		ldap_dnfree( dn );
+		ldap_dnfree_x( dn, ctx );
 
 		if ( rc != LDAP_SUCCESS ) {
 			return LDAP_INVALID_SYNTAX;
 		}
-
-		out = ber_bvstr( dn_out );
-
-	} else {
-		out = ber_bvdup( val );
 	}
 
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, "<<< dnPretty: <%s>\n", out->bv_val, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "<<< dnPretty: <%s>\n", out->bv_val, 0, 0 );
-
-	*pretty = out;
+#endif
 
 	return LDAP_SUCCESS;
 }
 
-/*
- * dnMatch routine
- */
 int
-dnMatch(
-	int *matchp,
-	slap_mask_t flags,
+dnPrettyNormalDN(
 	Syntax *syntax,
-	MatchingRule *mr,
-	struct berval *value,
-	void *assertedValue )
+	struct berval *val,
+	LDAPDN *dn,
+	int flags,
+	void *ctx )
 {
-	int match;
-	struct berval *asserted = (struct berval *) assertedValue;
-
-	assert( matchp );
-	assert( value );
-	assert( assertedValue );
-	
-	match = value->bv_len - asserted->bv_len;
-
-	if ( match == 0 ) {
-		match = strcmp( value->bv_val, asserted->bv_val );
-	}
+	assert( val );
+	assert( dn );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
-		"dnMatch: %d\n    %s\n    %s\n", match,
-		value->bv_val, asserted->bv_val ));
+	LDAP_LOG( OPERATION, ARGS, ">>> dn%sDN: <%s>\n", 
+			flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal", 
+			val->bv_val, 0 );
 #else
-	Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
-		match, value->bv_val, asserted->bv_val );
+	Debug( LDAP_DEBUG_TRACE, ">>> dn%sDN: <%s>\n", 
+			flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal", 
+			val->bv_val, 0 );
 #endif
 
-	*matchp = match;
-	return( LDAP_SUCCESS );
-}
+	if ( val->bv_len == 0 ) {
+		return LDAP_SUCCESS;
 
-#ifdef SLAP_DN_MIGRATION
-/*
- * these routines are provided for migration purposes only!
- *	dn_validate is deprecated in favor of dnValidate
- *	dn_normalize is deprecated in favor of dnNormalize
- *	strcmp/strcasecmp for DNs is deprecated in favor of dnMatch
- *
- * other routines are likewise deprecated but may not yet have
- * replacement functions.
- */
-
-/*
- * dn_validate - validate and compress dn.  the dn is
- * compressed in place are returned if valid.
- * Deprecated in favor of dnValidate()
- */
-char *
-dn_validate( char *dn )
-{
-	struct berval val;
-	struct berval *pretty = NULL;
-	int		rc;
+	} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		return LDAP_INVALID_SYNTAX;
 
-	if ( dn == NULL || dn[0] == '\0' ) {
-		return dn;
-	}
+	} else {
+		int		rc;
 
-	val.bv_val = dn;
-	val.bv_len = strlen( dn );
+		/* FIXME: should be liberal in what we accept */
+		rc = ldap_bv2dn_x( val, dn, LDAP_DN_FORMAT_LDAP, ctx );
+		if ( rc != LDAP_SUCCESS ) {
+			return LDAP_INVALID_SYNTAX;
+		}
 
-	rc = dnPretty( NULL, &val, &pretty );
-	if ( rc != LDAP_SUCCESS ) {
-		return NULL;
-	}
+		assert( strlen( val->bv_val ) == val->bv_len );
 
-	if ( val.bv_len < pretty->bv_len ) {
-		ber_bvfree( pretty );
-		return NULL;
+		/*
+		 * Schema-aware rewrite
+		 */
+		if ( LDAPDN_rewrite( *dn, flags, ctx ) != LDAP_SUCCESS ) {
+			ldap_dnfree_x( *dn, ctx );
+			*dn = NULL;
+			return LDAP_INVALID_SYNTAX;
+		}
 	}
 
-	AC_MEMCPY( dn, pretty->bv_val, pretty->bv_len + 1 );
-	ber_bvfree( pretty );
+	Debug( LDAP_DEBUG_TRACE, "<<< dn%sDN\n", 
+			flags == SLAP_LDAPDN_PRETTY ? "Pretty" : "Normal",
+			0, 0 );
 
-	return dn;
+	return LDAP_SUCCESS;
 }
 
 /*
- * dn_normalize - put dn into a canonical form suitable for storing
- * in a hash database.	this involves normalizing the case as well as
- * the format.	the dn is normalized in place as well as returned if valid.
- * Deprecated in favor of dnNormalize()
+ * Combination of both dnPretty and dnNormalize
  */
-char *
-dn_normalize( char *dn )
+int
+dnPrettyNormal(
+	Syntax *syntax,
+	struct berval *val,
+	struct berval *pretty,
+	struct berval *normal,
+	void *ctx)
 {
-	struct berval val;
-	struct berval *normalized = NULL;
-	int		rc;
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, ENTRY, ">>> dnPrettyNormal: <%s>\n", val->bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, ">>> dnPrettyNormal: <%s>\n", val->bv_val, 0, 0 );
+#endif
 
-	if ( dn == NULL || dn[0] == '\0' ) {
-		return dn;
-	}
+	assert( val );
+	assert( pretty );
+	assert( normal );
 
-	val.bv_val = dn;
-	val.bv_len = strlen( dn );
+	if ( val->bv_len == 0 ) {
+		ber_dupbv_x( pretty, val, ctx );
+		ber_dupbv_x( normal, val, ctx );
 
-	rc = dnNormalize( NULL, &val, &normalized );
-	if ( rc != LDAP_SUCCESS ) {
-		return NULL;
-	}
+	} else if ( val->bv_len > SLAP_LDAPDN_MAXLEN ) {
+		/* too big */
+		return LDAP_INVALID_SYNTAX;
+
+	} else {
+		LDAPDN		dn = NULL;
+		int		rc;
+
+		pretty->bv_val = NULL;
+		normal->bv_val = NULL;
+		pretty->bv_len = 0;
+		normal->bv_len = 0;
 
-	if ( val.bv_len < normalized->bv_len ) {
-		ber_bvfree( normalized );
-		return NULL;
+		/* FIXME: should be liberal in what we accept */
+		rc = ldap_bv2dn_x( val, &dn, LDAP_DN_FORMAT_LDAP, ctx );
+		if ( rc != LDAP_SUCCESS ) {
+			return LDAP_INVALID_SYNTAX;
+		}
+
+		assert( strlen( val->bv_val ) == val->bv_len );
+
+		/*
+		 * Schema-aware rewrite
+		 */
+		if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY, ctx ) != LDAP_SUCCESS ) {
+			ldap_dnfree_x( dn, ctx );
+			return LDAP_INVALID_SYNTAX;
+		}
+
+		rc = ldap_dn2bv_x( dn, pretty,
+			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
+
+		if ( rc != LDAP_SUCCESS ) {
+			ldap_dnfree_x( dn, ctx );
+			return LDAP_INVALID_SYNTAX;
+		}
+
+		if ( LDAPDN_rewrite( dn, 0, ctx ) != LDAP_SUCCESS ) {
+			ldap_dnfree_x( dn, ctx );
+			ber_memfree_x( pretty->bv_val, ctx );
+			pretty->bv_val = NULL;
+			pretty->bv_len = 0;
+			return LDAP_INVALID_SYNTAX;
+		}
+
+		rc = ldap_dn2bv_x( dn, normal,
+			LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
+
+		ldap_dnfree_x( dn, ctx );
+		if ( rc != LDAP_SUCCESS ) {
+			ber_memfree_x( pretty->bv_val, ctx );
+			pretty->bv_val = NULL;
+			pretty->bv_len = 0;
+			return LDAP_INVALID_SYNTAX;
+		}
 	}
 
-	AC_MEMCPY( dn, normalized->bv_val, normalized->bv_len + 1 );
-	ber_bvfree( normalized );
+#ifdef NEW_LOGGING
+	LDAP_LOG (OPERATION, RESULTS, "<<< dnPrettyNormal: <%s>, <%s>\n",
+		pretty->bv_val, normal->bv_val, 0  );
+#else
+	Debug( LDAP_DEBUG_TRACE, "<<< dnPrettyNormal: <%s>, <%s>\n",
+		pretty->bv_val, normal->bv_val, 0 );
+#endif
 
-	return dn;
+	return LDAP_SUCCESS;
 }
 
 /*
- * dnParent - dn's parent, in-place
+ * dnMatch routine
  */
 int
-dnParent( 
-	const char	*dn, 
-	const char	**pdn )
+dnMatch(
+	int *matchp,
+	slap_mask_t flags,
+	Syntax *syntax,
+	MatchingRule *mr,
+	struct berval *value,
+	void *assertedValue )
 {
-	LDAPRDN		*tmpRDN;
-	const char	*p;
-	int		rc;
-
-	rc = ldap_str2rdn( dn, &tmpRDN, &p, LDAP_DN_FORMAT_LDAP );
-	if ( rc != LDAP_SUCCESS ) {
-		return rc;
-	}
-	ldap_rdnfree( tmpRDN );
+	int match;
+	struct berval *asserted = (struct berval *) assertedValue;
 
-	assert( DN_SEPARATOR( p[ 0 ] ) );
-	p++;
+	assert( matchp );
+	assert( value );
+	assert( assertedValue );
+	
+	match = value->bv_len - asserted->bv_len;
 
-	while ( ASCII_SPACE( p[ 0 ] ) ) {
-		p++;
+	if ( match == 0 ) {
+		match = memcmp( value->bv_val, asserted->bv_val, 
+				value->bv_len );
 	}
 
-	*pdn = p;
+#ifdef NEW_LOGGING
+	LDAP_LOG( CONFIG, ENTRY, "dnMatch: %d\n    %s\n    %s\n", 
+		match, value->bv_val, asserted->bv_val  );
+#else
+	Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
+		match, value->bv_val, asserted->bv_val );
+#endif
 
-	return LDAP_SUCCESS;
+	*matchp = match;
+	return( LDAP_SUCCESS );
 }
 
 /*
- * dn_parent - return the dn's parent, in-place
- * FIXME: should be replaced by dnParent()
+ * dnParent - dn's parent, in-place
+ *
+ * note: the incoming dn is assumed to be normalized/prettyfied,
+ * so that escaped rdn/ava separators are in '\'+hexpair form
  */
-char *
-dn_parent(
-	Backend		*be,
-	const char	*dn )
+void
+dnParent( 
+	struct berval	*dn, 
+	struct berval	*pdn )
 {
-	const char	*pdn;
+	char	*p;
 
-	if ( dn == NULL ) {
-		return NULL;
-	}
+	p = strchr( dn->bv_val, ',' );
 
-	while ( dn[ 0 ] != '\0' && ASCII_SPACE( dn[ 0 ] ) ) {
-		dn++;
+	/* one-level dn */
+	if ( p == NULL ) {
+		pdn->bv_len = 0;
+		pdn->bv_val = dn->bv_val + dn->bv_len;
+		return;
 	}
 
-	if ( dn[ 0 ] == '\0' ) {
-		return NULL;
-	}
+	assert( DN_SEPARATOR( p[ 0 ] ) );
+	p++;
 
-	if ( be != NULL && be_issuffix( be, dn ) ) {
-		return NULL;
-	}
+	assert( ATTR_LEADCHAR( p[ 0 ] ) );
+	pdn->bv_val = p;
+	pdn->bv_len = dn->bv_len - (p - dn->bv_val);
 
-	if ( dnParent( dn, &pdn ) != LDAP_SUCCESS ) {
-		return NULL;
-	}
-	
-	return ( char * )pdn;
+	return;
 }
 
 int
 dnExtractRdn( 
-	const char	*dn, 
-	struct berval 	**rdn )
+	struct berval	*dn, 
+	struct berval 	*rdn,
+	void *ctx )
 {
-	LDAPRDN		*tmpRDN;
+	LDAPRDN		tmpRDN;
 	const char	*p;
-	char		*rdnout;
 	int		rc;
 
 	assert( dn );
 	assert( rdn );
 
-	rc = ldap_str2rdn( dn, &tmpRDN, &p, LDAP_DN_FORMAT_LDAP );
-	if ( rc != LDAP_SUCCESS ) {
-		return rc;
+	if( dn->bv_len == 0 ) {
+		return LDAP_OTHER;
 	}
 
-	rc = ldap_rdn2str( tmpRDN, &rdnout, LDAP_DN_FORMAT_LDAPV3 );
-	ldap_rdnfree( tmpRDN );
+	rc = ldap_bv2rdn_x( dn, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP, ctx );
 	if ( rc != LDAP_SUCCESS ) {
 		return rc;
 	}
 
-	*rdn = ber_bvstr( rdnout );
-	if ( *rdn == NULL ) {
-		free( rdnout );
-		return LDAP_NO_MEMORY;
+	rc = ldap_rdn2bv_x( tmpRDN, rdn, LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY, ctx );
+
+	ldap_rdnfree_x( tmpRDN, ctx );
+	if ( rc != LDAP_SUCCESS ) {
+		return rc;
 	}
 
 	return LDAP_SUCCESS;
 }
 
 /*
- * FIXME: should be replaced by dnExtractRdn() (together with dn_rdn)
+ * We can assume the input is a prettied or normalized DN
  */
 int 
 dn_rdnlen(
 	Backend		*be,
-	const char	*dn_in )
+	struct berval	*dn_in )
 {
-	struct berval	*rdn = NULL;
-	int		retval = 0;
+	const char	*p;
 
 	assert( dn_in );
 
@@ -653,11 +748,7 @@ dn_rdnlen(
 		return 0;
 	}
 
-	while ( dn_in[ 0 ] && ASCII_SPACE( dn_in[ 0 ] ) ) {
-		dn_in++;
-	}
-
-	if ( dn_in[ 0 ] == '\0' ) {
+	if ( !dn_in->bv_len ) {
 		return 0;
 	}
 
@@ -665,185 +756,9 @@ dn_rdnlen(
 		return 0;
 	}
 
-	if ( dnExtractRdn( dn_in, &rdn ) != LDAP_SUCCESS ) {
-		ber_bvfree( rdn );
-		return 0;
-	}
-
-	retval = rdn->bv_len;
-	ber_bvfree( rdn );
-
-	return retval;
-}
-
-/*
- * FIXME: should be replaced by dnExtractRdn() (together with dn_rdnlen)
- */
-char * dn_rdn(
-	Backend	*be,
-	const char	*dn_in )
-{
-	struct berval	*rdn = NULL;
-	char		*retval;
-
-	assert( dn_in );
-
-	if ( dn_in == NULL ) {
-		return NULL;
-	}
-
-	while ( dn_in[ 0 ] && ASCII_SPACE( dn_in[ 0 ] ) ) {
-		dn_in++;
-	}
-
-	if ( dn_in[ 0 ] == '\0' ) {
-		return NULL;
-	}
-
-	if ( be != NULL && be_issuffix( be, dn_in ) ) {
-		return NULL;
-	}
-
-	if ( dnExtractRdn( dn_in, &rdn ) != LDAP_SUCCESS ) {
-		ber_bvfree( rdn );
-		return NULL;
-	}
-
-	retval = rdn->bv_val;
-	free( rdn );
-
-	return retval;
-}
-
-/*
- * dn_issuffix - tells whether suffix is a suffix of dn.
- * Both dn and suffix must be normalized.
- *	deprecated in favor of dnIsSuffix()
- */
-int
-dn_issuffix(
-	const char	*dn,
-	const char	*suffix
-)
-{
-	struct berval	bvdn, bvsuffix;
-
-	assert( dn );
-	assert( suffix );
-
-	bvdn.bv_val = (char *) dn;
-	bvdn.bv_len = strlen( dn );
-	bvsuffix.bv_val = (char *) suffix;
-	bvsuffix.bv_len = strlen( suffix );
-
-	return dnIsSuffix( &bvdn, &bvsuffix );
-}
-
-/* rdn_attr_type:
- *
- * Given a string (i.e. an rdn) of the form:
- *	 "attribute_type = attribute_value"
- * this function returns the type of an attribute, that is the
- * string "attribute_type" which is placed in newly allocated
- * memory. The returned string will be null-terminated.
- *
- * Deprecated
- */
-
-char * rdn_attr_type( const char * s )
-{
-	char 	**attrs, **values, *retval;
-
-	if ( rdn_attrs( s, &attrs, &values ) != LDAP_SUCCESS ) {
-		return NULL;
-	}
-
-	retval = ch_strdup( attrs[ 0 ] );
-
-	charray_free( attrs );
-	charray_free( values );
-
-	return retval;
-}
-
-
-/* rdn_attr_value:
- *
- * Given a string (i.e. an rdn) of the form:
- *	 "attribute_type = attribute_value"
- * this function returns "attribute_type" which is placed in newly allocated
- * memory. The returned string will be null-terminated and may contain
- * spaces (i.e. "John Doe\0").
- *
- * Deprecated
- */
-
-char *
-rdn_attr_value( const char * rdn )
-{
-	char 	**attrs, **values, *retval;
-
-	if ( rdn_attrs( rdn, &attrs, &values ) != LDAP_SUCCESS ) {
-		return NULL;
-	}
-
-	retval = ch_strdup( values[ 0 ] );
-
-	charray_free( attrs );
-	charray_free( values );
-
-	return retval;
-}
-
-
-/* rdn_attrs:
- *
- * Given a string (i.e. an rdn) of the form:
- *   "attribute_type=attribute_value[+attribute_type=attribute_value[...]]"
- * this function stores the types of the attributes in ptypes, that is the
- * array of strings "attribute_type" which is placed in newly allocated
- * memory, and the values of the attributes in pvalues, that is the
- * array of strings "attribute_value" which is placed in newly allocated
- * memory. Returns 0 on success, -1 on failure.
- *
- * note: got part of the code from dn_validate
- *
- * Deprecated; directly use LDAPRDN from ldap_str2rdn
- */
-int
-rdn_attrs( const char * rdn, char ***types, char ***values)
-{
-	LDAPRDN		*tmpRDN;
-	const char	*p;
-	int		iAVA;
-	int		rc;
-	
-	assert( rdn );
-	assert( values );
-
-	rc = ldap_str2rdn( rdn, &tmpRDN, &p, LDAP_DN_FORMAT_LDAP );
-	if ( rc != LDAP_SUCCESS ) {
-		return rc;
-	}
-
-	for ( iAVA = 0; tmpRDN[ iAVA ]; iAVA++ ) {
-		LDAPAVA		*ava = tmpRDN[ iAVA ][ 0 ];
+	p = strchr( dn_in->bv_val, ',' );
 
-		assert( ava );
-		assert( ava->la_attr );
-		assert( ava->la_value );
-
-		if ( types ) {
-			charray_add_n( types, ava->la_attr->bv_val, 
-					ava->la_attr->bv_len );
-		}
-		charray_add_n( values, ava->la_value->bv_val, 
-				ava->la_value->bv_len );
-	}
-
-	ldap_rdnfree( tmpRDN );
-
-	return LDAP_SUCCESS;
+	return p ? p - dn_in->bv_val : dn_in->bv_len;
 }
 
 
@@ -860,7 +775,9 @@ rdnValidate( struct berval *rdn )
 	 * input is a pretty or normalized DN
 	 * hence, we can just search for ','
 	 */
-	if( rdn == NULL || rdn->bv_len == 0 ) {
+	if( rdn == NULL || rdn->bv_len == 0 ||
+		rdn->bv_len > SLAP_LDAPDN_MAXLEN )
+	{
 		return LDAP_INVALID_SYNTAX;
 	}
 
@@ -882,7 +799,7 @@ rdnValidate( struct berval *rdn )
 	/*
 	 * must be parsable
 	 */
-	rc = ldap_str2rdn( rdn, &RDN, &p, LDAP_DN_FORMAT_LDAP );
+	rc = ldap_bv2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
 	if ( rc != LDAP_SUCCESS ) {
 		return 0;
 	}
@@ -921,24 +838,24 @@ rdnValidate( struct berval *rdn )
 void
 build_new_dn( struct berval * new_dn,
 	struct berval * parent_dn,
-	struct berval * newrdn )
+	struct berval * newrdn,
+	void *memctx )
 {
 	char *ptr;
 
-	if ( parent_dn == NULL ) {
+	if ( parent_dn == NULL || parent_dn->bv_len == 0 ) {
 		ber_dupbv( new_dn, newrdn );
 		return;
 	}
 
 	new_dn->bv_len = parent_dn->bv_len + newrdn->bv_len + 1;
-	new_dn->bv_val = (char *) ch_malloc( new_dn->bv_len + 1 );
+	new_dn->bv_val = (char *) slap_sl_malloc( new_dn->bv_len + 1, memctx );
 
-	ptr = slap_strcopy( new_dn->bv_val, newrdn->bv_val );
+	ptr = lutil_strcopy( new_dn->bv_val, newrdn->bv_val );
 	*ptr++ = ',';
 	strcpy( ptr, parent_dn->bv_val );
 }
 
-#endif /* SLAP_DN_MIGRATION */
 
 /*
  * dnIsSuffix - tells whether suffix is a suffix of dn.
@@ -965,8 +882,7 @@ dnIsSuffix(
 	}
 
 	/* no rdn separator or escaped rdn separator */
-	if ( d > 1 && ( !DN_SEPARATOR( dn->bv_val[ d - 1 ] ) 
-				|| DN_ESCAPE( dn->bv_val[ d - 2 ] ) ) ) {
+	if ( d > 1 && !DN_SEPARATOR( dn->bv_val[ d - 1 ] ) ) {
 		return 0;
 	}
 
@@ -978,3 +894,31 @@ dnIsSuffix(
 	/* compare */
 	return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
 }
+
+#ifdef HAVE_TLS
+/*
+ * Convert an X.509 DN into a normalized LDAP DN
+ */
+int
+dnX509normalize( void *x509_name, struct berval *out )
+{
+	/* Invoke the LDAP library's converter with our schema-rewriter */
+	int rc = ldap_X509dn2bv( x509_name, out, LDAPDN_rewrite, 0 );
+
+	Debug( LDAP_DEBUG_TRACE,
+		"dnX509Normalize: <%s>\n", out->bv_val, 0, 0 );
+
+	return rc;
+}
+
+/*
+ * Get the TLS session's peer's DN into a normalized LDAP DN
+ */
+int
+dnX509peerNormalize( void *ssl, struct berval *dn )
+{
+
+	return ldap_pvt_tls_get_peer_dn( ssl, dn,
+		(LDAPDN_rewrite_dummy *)LDAPDN_rewrite, 0 );
+}
+#endif