--- servers/slapd/filter.c	1998/11/29 21:52:35	1.4.2.4
+++ servers/slapd/filter.c	2000/07/02 05:18:55	1.50
@@ -1,4 +1,9 @@
 /* filter.c - routines for parsing and dealing with filters */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.49 2000/07/01 02:57:54 kurt Exp $ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -9,16 +14,38 @@
 
 #include "slap.h"
 
-static int	get_filter_list(Connection *conn, BerElement *ber, Filter **f, char **fstr);
-static int	get_substring_filter(Connection *conn, BerElement *ber, Filter *f, char **fstr);
+static int	get_filter_list(
+	Connection *conn,
+	BerElement *ber,
+	Filter **f,
+	char **fstr,
+	const char **text );
+
+static int	get_substring_filter(
+	Connection *conn,
+	BerElement *ber,
+	Filter *f,
+	char **fstr,
+	const char **text );
+
+static int escape_value(
+	struct berval *in,
+	struct berval *out );
 
 int
-get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
+get_filter(
+	Connection *conn,
+	BerElement *ber,
+	Filter **filt,
+	char **fstr,
+	const char **text )
 {
-	unsigned long	tag, len;
+	ber_tag_t	tag;
+	ber_len_t	len;
 	int		err;
 	Filter		*f;
-	char		*ftmp;
+	char		*ftmp = NULL;
+	struct berval escaped;
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
 
@@ -34,6 +61,7 @@ get_filter( Connection *conn, BerElement
 	 *		lessOrEqual	[6]	AttributeValueAssertion,
 	 *		present		[7]	AttributeType,,
 	 *		approxMatch	[8]	AttributeValueAssertion
+	 *		extensibleMatch [9] MatchingRuleAssertion
 	 *	}
 	 *
 	 *	SubstringFilter ::= SEQUENCE {
@@ -44,137 +72,228 @@ get_filter( Connection *conn, BerElement
 	 *			final            [2] IA5String
 	 *		}
 	 *	}
+	 *
+     *  MatchingRuleAssertion ::= SEQUENCE {
+     *          matchingRule    [1] MatchingRuleId OPTIONAL,
+     *          type            [2] AttributeDescription OPTIONAL,
+     *          matchValue      [3] AssertionValue,
+     *          dnAttributes    [4] BOOLEAN DEFAULT FALSE
+	 *	}
+	 *
 	 */
 
+	tag = ber_peek_tag( ber, &len );
+
+	if( tag == LBER_ERROR ) {
+		*text = "error decoding filter";
+		return SLAPD_DISCONNECT;
+	}
+
 	f = (Filter *) ch_malloc( sizeof(Filter) );
-	*filt = f;
 	f->f_next = NULL;
 
-	err = 0;
+	err = LDAP_SUCCESS;
 	*fstr = NULL;
-	f->f_choice = ber_peek_tag( ber, &len );
-#ifdef LDAP_COMPAT30
-	if ( conn->c_version == 30 ) {
-		switch ( f->f_choice ) {
-		case LDAP_FILTER_EQUALITY:
-		case LDAP_FILTER_GE:
-		case LDAP_FILTER_LE:
-		case LDAP_FILTER_PRESENT:
-		case LDAP_FILTER_PRESENT_30:
-		case LDAP_FILTER_APPROX:
-			(void) ber_skip_tag( ber, &len );
-			if ( f->f_choice == LDAP_FILTER_PRESENT_30 ) {
-				f->f_choice = LDAP_FILTER_PRESENT;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-#endif
+	f->f_choice = tag; 
+
 	switch ( f->f_choice ) {
 	case LDAP_FILTER_EQUALITY:
 		Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
-			*fstr = ch_malloc(4 + strlen( f->f_avtype ) +
-			    f->f_avvalue.bv_len);
-			sprintf( *fstr, "(%s=%s)", f->f_avtype,
-			    f->f_avvalue.bv_val );
+
+		err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text );
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+
+		assert( f->f_ava != NULL );
+
+		escape_value( f->f_av_value, &escaped );
+
+		*fstr = ch_malloc( sizeof("(=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ escaped.bv_len );
+
+		sprintf( *fstr, "(%s=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+
+		ber_memfree( escaped.bv_val );
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
 		Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
-		err = get_substring_filter( conn, ber, f, fstr );
+		err = get_substring_filter( conn, ber, f, fstr, text );
 		break;
 
 	case LDAP_FILTER_GE:
 		Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
-			*fstr = ch_malloc(5 + strlen( f->f_avtype ) +
-			    f->f_avvalue.bv_len);
-			sprintf( *fstr, "(%s>=%s)", f->f_avtype,
-			    f->f_avvalue.bv_val );
+
+		err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+
+		escape_value( f->f_av_value, &escaped );
+
+		*fstr = ch_malloc( sizeof("(>=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ escaped.bv_len );
+
+		sprintf( *fstr, "(%s>=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+
+		ber_memfree( escaped.bv_val );
 		break;
 
 	case LDAP_FILTER_LE:
 		Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
-			*fstr = ch_malloc(5 + strlen( f->f_avtype ) +
-			    f->f_avvalue.bv_len);
-			sprintf( *fstr, "(%s<=%s)", f->f_avtype,
-			    f->f_avvalue.bv_val );
+
+		err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+
+
+		escape_value( f->f_av_value, &escaped );
+
+		*fstr = ch_malloc( sizeof("(<=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ escaped.bv_len );
+
+		sprintf( *fstr, "(%s<=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+
+		ber_memfree( escaped.bv_val );
 		break;
 
-	case LDAP_FILTER_PRESENT:
+	case LDAP_FILTER_PRESENT: {
+		struct berval type;
+
 		Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
-		if ( ber_scanf( ber, "a", &f->f_type ) == LBER_ERROR ) {
-			err = LDAP_PROTOCOL_ERROR;
-		} else {
-			err = LDAP_SUCCESS;
-			attr_normalize( f->f_type );
-			*fstr = ch_malloc( 5 + strlen( f->f_type ) );
-			sprintf( *fstr, "(%s=*)", f->f_type );
+
+		if ( ber_scanf( ber, "o", &type ) == LBER_ERROR ) {
+			err = SLAPD_DISCONNECT;
+			*text = "error decoding filter";
+			break;
 		}
-		break;
+
+		f->f_desc = NULL;
+		err = slap_bv2ad( &type, &f->f_desc, text );
+
+		if( err != LDAP_SUCCESS ) {
+			ch_free( type.bv_val );
+			break;
+		}
+
+		ch_free( type.bv_val );
+
+		*fstr = ch_malloc( sizeof("(=*)")
+			+ f->f_desc->ad_cname->bv_len );
+		sprintf( *fstr, "(%s=*)",
+			f->f_desc->ad_cname->bv_val );
+
+		} break;
 
 	case LDAP_FILTER_APPROX:
 		Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == 0 ) {
-			*fstr = ch_malloc(5 + strlen( f->f_avtype ) +
-			    f->f_avvalue.bv_len);
-			sprintf( *fstr, "(%s~=%s)", f->f_avtype,
-			    f->f_avvalue.bv_val );
+
+		err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text );
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+
+		escape_value( f->f_av_value, &escaped );
+
+		*fstr = ch_malloc( sizeof("(~=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ escaped.bv_len );
+
+		sprintf( *fstr, "(%s~=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+
+		ber_memfree( escaped.bv_val );
 		break;
 
 	case LDAP_FILTER_AND:
 		Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
-		if ( (err = get_filter_list( conn, ber, &f->f_and, &ftmp ))
-		    == 0 ) {
-			if (ftmp == NULL) ftmp = ch_strdup("");
-			*fstr = ch_malloc( 4 + strlen( ftmp ) );
-			sprintf( *fstr, "(&%s)", ftmp );
-			free( ftmp );
+		err = get_filter_list( conn, ber, &f->f_and, &ftmp, text );
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+		*fstr = ch_malloc( sizeof("(&)")
+			+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) );
+		sprintf( *fstr, "(&%s)",
+			ftmp == NULL ? "" : ftmp );
 		break;
 
 	case LDAP_FILTER_OR:
 		Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
-		if ( (err = get_filter_list( conn, ber, &f->f_or, &ftmp ))
-		    == 0 ) {
-			if (ftmp == NULL) ftmp = ch_strdup("");
-			*fstr = ch_malloc( 4 + strlen( ftmp ) );
-			sprintf( *fstr, "(|%s)", ftmp );
-			free( ftmp );
+		err = get_filter_list( conn, ber, &f->f_and, &ftmp, text );
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+		*fstr = ch_malloc( sizeof("(!)")
+			+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) );
+		sprintf( *fstr, "(|%s)",
+			ftmp == NULL ? "" : ftmp );
 		break;
 
 	case LDAP_FILTER_NOT:
 		Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
 		(void) ber_skip_tag( ber, &len );
-		if ( (err = get_filter( conn, ber, &f->f_not, &ftmp )) == 0 ) {
-			if (ftmp == NULL) ftmp = ch_strdup("");
-			*fstr = ch_malloc( 4 + strlen( ftmp ) );
-			sprintf( *fstr, "(!%s)", ftmp );
-			free( ftmp );
+		err = get_filter( conn, ber, &f->f_not, &ftmp, text );
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+		*fstr = ch_malloc( sizeof("(!)")
+			+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) );
+		sprintf( *fstr, "(!%s)",
+			ftmp == NULL ? "" : ftmp );
+		break;
+
+	case LDAP_FILTER_EXT:
+		/* not yet implemented */
+		Debug( LDAP_DEBUG_ANY, "extensible match not yet implemented.\n",
+		       f->f_choice, 0, 0 );
+		(void) ber_skip_tag( ber, &len );
+		f->f_choice = SLAPD_FILTER_COMPUTED;
+		f->f_result = SLAPD_COMPARE_UNDEFINED;
+		*fstr = ch_strdup( "(extended)" );
 		break;
 
 	default:
-		Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",
+		(void) ber_skip_tag( ber, &len );
+		Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
 		       f->f_choice, 0, 0 );
-		err = LDAP_PROTOCOL_ERROR;
+		f->f_choice = SLAPD_FILTER_COMPUTED;
+		f->f_result = SLAPD_COMPARE_UNDEFINED;
+		*fstr = ch_strdup( "(undefined)" );
 		break;
 	}
 
-	if ( err != 0 ) {
-		free( (char *) f );
+	free( ftmp );
+
+	if ( err != LDAP_SUCCESS ) {
 		if ( *fstr != NULL ) {
 			free( *fstr );
 		}
+
+		if( err != SLAPD_DISCONNECT ) {
+			/* ignore error */
+			f->f_choice = SLAPD_FILTER_COMPUTED;
+			f->f_result = SLAPD_COMPARE_UNDEFINED;
+			*fstr = ch_strdup( "(badfilter)" );
+			err = LDAP_SUCCESS;
+			*filt = f;
+
+		} else {
+			free(f);
+		}
+	} else {
+		*filt = f;
 	}
 
 	Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
@@ -182,26 +301,27 @@ get_filter( Connection *conn, BerElement
 }
 
 static int
-get_filter_list( Connection *conn, BerElement *ber, Filter **f, char **fstr )
+get_filter_list( Connection *conn, BerElement *ber,
+	Filter **f, char **fstr,
+	const char **text )
 {
 	Filter		**new;
 	int		err;
-	unsigned long	tag, len;
+	ber_tag_t	tag;
+	ber_len_t	len;
 	char		*last, *ftmp;
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
 
-#ifdef LDAP_COMPAT30
-	if ( conn->c_version == 30 ) {
-		(void) ber_skip_tag( ber, &len );
-	}
-#endif
 	*fstr = NULL;
 	new = f;
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-	    tag = ber_next_element( ber, &len, last ) ) {
-		if ( (err = get_filter( conn, ber, new, &ftmp )) != 0 )
+	    tag = ber_next_element( ber, &len, last ) )
+	{
+		err = get_filter( conn, ber, new, &ftmp, text );
+		if ( err != LDAP_SUCCESS )
 			return( err );
+
 		if ( *fstr == NULL ) {
 			*fstr = ftmp;
 		} else {
@@ -215,7 +335,7 @@ get_filter_list( Connection *conn, BerEl
 	*new = NULL;
 
 	Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
-	return( 0 );
+	return( LDAP_SUCCESS );
 }
 
 static int
@@ -223,106 +343,192 @@ get_substring_filter(
     Connection	*conn,
     BerElement	*ber,
     Filter	*f,
-    char	**fstr
+    char	**fstr,
+	const char	**text
 )
 {
-	unsigned long	tag, len, rc;
-	char		*val, *last;
-	int		syntax;
+	ber_tag_t	tag;
+	ber_len_t	len;
+	ber_tag_t	rc;
+	struct berval *value;
+	struct berval escaped;
+	char		*last;
+	struct berval type;
+	struct berval *nvalue;
+	*text = "error decoding filter";
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 
-#ifdef LDAP_COMPAT30
-	if ( conn->c_version == 30 ) {
-		(void) ber_skip_tag( ber, &len );
+	if ( ber_scanf( ber, "{o" /*}*/, &type ) == LBER_ERROR ) {
+		return SLAPD_DISCONNECT;
 	}
-#endif
-	if ( ber_scanf( ber, "{a", &f->f_sub_type ) == LBER_ERROR ) {
-		return( LDAP_PROTOCOL_ERROR );
+
+	f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) );
+	f->f_sub_desc = NULL;
+	rc = slap_bv2ad( &type, &f->f_sub_desc, text );
+
+	ch_free( type.bv_val );
+
+	if( rc != LDAP_SUCCESS ) {
+		text = NULL;
+		ch_free( f->f_sub );
+		f->f_choice = SLAPD_FILTER_COMPUTED;
+		f->f_result = SLAPD_COMPARE_UNDEFINED;
+		*fstr = ch_strdup( "(undefined)" );
+		return LDAP_SUCCESS;
 	}
-	attr_normalize( f->f_sub_type );
-	syntax = attr_syntax( f->f_sub_type );
+
 	f->f_sub_initial = NULL;
 	f->f_sub_any = NULL;
 	f->f_sub_final = NULL;
 
-	*fstr = ch_malloc( strlen( f->f_sub_type ) + 3 );
-	sprintf( *fstr, "(%s=", f->f_sub_type );
+	if( fstr ) {
+		*fstr = ch_malloc( sizeof("(=" /*)*/) +
+			f->f_sub_desc->ad_cname->bv_len );
+		sprintf( *fstr, "(%s=" /*)*/, f->f_sub_desc->ad_cname->bv_val );
+	}
+
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-	    tag = ber_next_element( ber, &len, last ) ) {
-#ifdef LDAP_COMPAT30
-		if ( conn->c_version == 30 ) {
-			rc = ber_scanf( ber, "{a}", &val );
-		} else
-#endif
-			rc = ber_scanf( ber, "a", &val );
+	    tag = ber_next_element( ber, &len, last ) )
+	{
+		unsigned usage;
+
+		rc = ber_scanf( ber, "O", &value );
 		if ( rc == LBER_ERROR ) {
-			return( LDAP_PROTOCOL_ERROR );
+			rc = SLAPD_DISCONNECT;
+			goto return_error;
 		}
-		if ( val == NULL || *val == '\0' ) {
-			if ( val != NULL ) {
-				free( val );
-			}
-			return( LDAP_INVALID_SYNTAX );
+
+		if ( value == NULL || value->bv_len == 0 ) {
+			ber_bvfree( value );
+			rc = LDAP_INVALID_SYNTAX;
+			goto return_error;
+		} 
+
+		switch ( tag ) {
+		case LDAP_SUBSTRING_INITIAL:
+			usage = SLAP_MR_SUBSTR_INITIAL;
+			break;
+
+		case LDAP_SUBSTRING_ANY:
+			usage = SLAP_MR_SUBSTR_ANY;
+			break;
+
+		case LDAP_SUBSTRING_FINAL:
+			usage = SLAP_MR_SUBSTR_FINAL;
+			break;
+
+		default:
+			rc = LDAP_PROTOCOL_ERROR;
+
+			Debug( LDAP_DEBUG_FILTER,
+				"  unknown substring choice=%ld\n",
+				(long) tag, 0, 0 );
+
+			ber_bvfree( value );
+			goto return_error;
+		}
+
+		rc = value_normalize( f->f_sub_desc, usage, value, &nvalue, text );
+		ber_bvfree( value );
+
+		if( rc != LDAP_SUCCESS ) {
+			goto return_error;
 		}
-		value_normalize( val, syntax );
+
+		value = nvalue;
+
+		rc = LDAP_PROTOCOL_ERROR;
 
 		switch ( tag ) {
-#ifdef LDAP_COMPAT30
-		case LDAP_SUBSTRING_INITIAL_30:
-#endif
 		case LDAP_SUBSTRING_INITIAL:
 			Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
 			if ( f->f_sub_initial != NULL ) {
-				return( LDAP_PROTOCOL_ERROR );
+				ber_bvfree( value );
+				goto return_error;
+			}
+
+			f->f_sub_initial = value;
+
+			if( fstr ) {
+				escape_value( value, &escaped );
+				*fstr = ch_realloc( *fstr,
+					strlen( *fstr ) + escaped.bv_len + 1 );
+				strcat( *fstr, escaped.bv_val );
+				ber_memfree( escaped.bv_val );
 			}
-			f->f_sub_initial = val;
-			*fstr = ch_realloc( *fstr, strlen( *fstr ) +
-			    strlen( val ) + 1 );
-			strcat( *fstr, val );
 			break;
 
-#ifdef LDAP_COMPAT30
-		case LDAP_SUBSTRING_ANY_30:
-#endif
 		case LDAP_SUBSTRING_ANY:
 			Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
-			charray_add( &f->f_sub_any, val );
-			*fstr = ch_realloc( *fstr, strlen( *fstr ) +
-			    strlen( val ) + 2 );
-			strcat( *fstr, "*" );
-			strcat( *fstr, val );
+			if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) {
+				ber_bvfree( value );
+				goto return_error;
+			}
+
+			if( fstr ) {
+				escape_value( value, &escaped );
+				*fstr = ch_realloc( *fstr,
+					strlen( *fstr ) + escaped.bv_len + 2 );
+				strcat( *fstr, "*" );
+				strcat( *fstr, escaped.bv_val );
+				ber_memfree( escaped.bv_val );
+			}
 			break;
 
-#ifdef LDAP_COMPAT30
-		case LDAP_SUBSTRING_FINAL_30:
-#endif
 		case LDAP_SUBSTRING_FINAL:
 			Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
 			if ( f->f_sub_final != NULL ) {
-				return( LDAP_PROTOCOL_ERROR );
+				ber_bvfree( value );
+				goto return_error;
+			}
+			f->f_sub_final = value;
+
+			if( fstr ) {
+				escape_value( value, &escaped );
+				*fstr = ch_realloc( *fstr,
+					strlen( *fstr ) + escaped.bv_len + 2 );
+				strcat( *fstr, "*" );
+				strcat( *fstr, escaped.bv_val );
+				ber_memfree( escaped.bv_val );
 			}
-			f->f_sub_final = val;
-			*fstr = ch_realloc( *fstr, strlen( *fstr ) +
-			    strlen( val ) + 2 );
-			strcat( *fstr, "*" );
-			strcat( *fstr, val );
 			break;
 
 		default:
-			Debug( LDAP_DEBUG_FILTER, "  unknown type\n", tag, 0,
-			    0 );
-			return( LDAP_PROTOCOL_ERROR );
+			Debug( LDAP_DEBUG_FILTER,
+				"  unknown substring type=%ld\n",
+				(long) tag, 0, 0 );
+
+			ber_bvfree( value );
+
+return_error:
+			Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
+				(long) rc, 0, 0 );
+
+			if( fstr ) {
+				free( *fstr );
+				*fstr = NULL;
+			}
+
+			ad_free( f->f_sub_desc, 1 );
+			ber_bvfree( f->f_sub_initial );
+			ber_bvecfree( f->f_sub_any );
+			ber_bvfree( f->f_sub_final );
+			ch_free( f->f_sub );
+			return rc;
 		}
 	}
-	*fstr = ch_realloc( *fstr, strlen( *fstr ) + 3 );
-	if ( f->f_sub_final == NULL ) {
-		strcat( *fstr, "*" );
+
+	if( fstr ) {
+		*fstr = ch_realloc( *fstr, strlen( *fstr ) + 3 );
+		if ( f->f_sub_final == NULL ) {
+			strcat( *fstr, "*" );
+		}
+		strcat( *fstr, /*(*/ ")" );
 	}
-	strcat( *fstr, ")" );
 
 	Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
-	return( 0 );
+	return( LDAP_SUCCESS );
 }
 
 void
@@ -335,29 +541,25 @@ filter_free( Filter *f )
 	}
 
 	switch ( f->f_choice ) {
+	case LDAP_FILTER_PRESENT:
+		ad_free( f->f_desc, 1 );
+		break;
+
 	case LDAP_FILTER_EQUALITY:
 	case LDAP_FILTER_GE:
 	case LDAP_FILTER_LE:
 	case LDAP_FILTER_APPROX:
-		ava_free( &f->f_ava, 0 );
+		ava_free( f->f_ava, 1 );
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
-		if ( f->f_sub_type != NULL ) {
-			free( f->f_sub_type );
-		}
+		ad_free( f->f_sub_desc, 1 );
 		if ( f->f_sub_initial != NULL ) {
-			free( f->f_sub_initial );
+			ber_bvfree( f->f_sub_initial );
 		}
-		charray_free( f->f_sub_any );
+		ber_bvecfree( f->f_sub_any );
 		if ( f->f_sub_final != NULL ) {
-			free( f->f_sub_final );
-		}
-		break;
-
-	case LDAP_FILTER_PRESENT:
-		if ( f->f_type != NULL ) {
-			free( f->f_type );
+			ber_bvfree( f->f_sub_final );
 		}
 		break;
 
@@ -370,82 +572,152 @@ filter_free( Filter *f )
 		}
 		break;
 
+	case SLAPD_FILTER_COMPUTED:
+		break;
+
 	default:
-		Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",
+		Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
 		       f->f_choice, 0, 0 );
 		break;
 	}
+
 	free( f );
 }
 
 #ifdef LDAP_DEBUG
-
 void
 filter_print( Filter *f )
 {
 	int	i;
 	Filter	*p;
+	struct berval escaped;
 
 	if ( f == NULL ) {
-		fprintf( stderr, "NULL" );
+		fprintf( stderr, "No filter!" );
 	}
 
 	switch ( f->f_choice ) {
 	case LDAP_FILTER_EQUALITY:
-		fprintf( stderr, "(%s=%s)", f->f_ava.ava_type,
-		    f->f_ava.ava_value.bv_val );
+		escape_value( f->f_av_value, &escaped );
+		fprintf( stderr, "(%s=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+		ber_memfree( escaped.bv_val );
 		break;
 
 	case LDAP_FILTER_GE:
-		fprintf( stderr, "(%s>=%s)", f->f_ava.ava_type,
-		    f->f_ava.ava_value.bv_val );
+		escape_value( f->f_av_value, &escaped );
+		fprintf( stderr, "(%s>=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+		ber_memfree( escaped.bv_val );
 		break;
 
 	case LDAP_FILTER_LE:
-		fprintf( stderr, "(%s<=%s)", f->f_ava.ava_type,
-		    f->f_ava.ava_value.bv_val );
+		escape_value( f->f_av_value, &escaped );
+		fprintf( stderr, "(%s<=%s)",
+			f->f_ava->aa_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+		ber_memfree( escaped.bv_val );
 		break;
 
 	case LDAP_FILTER_APPROX:
-		fprintf( stderr, "(%s~=%s)", f->f_ava.ava_type,
-		    f->f_ava.ava_value.bv_val );
+		escape_value( f->f_av_value, &escaped );
+		fprintf( stderr, "(%s~=%s)",
+			f->f_ava->aa_desc->ad_cname->bv_val,
+		    escaped.bv_val );
+		ber_memfree( escaped.bv_val );
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
-		fprintf( stderr, "(%s=", f->f_sub_type );
+		fprintf( stderr, "(%s=" /*)*/,
+			f->f_sub_desc->ad_cname->bv_val );
 		if ( f->f_sub_initial != NULL ) {
-			fprintf( stderr, "%s", f->f_sub_initial );
+			escape_value( f->f_sub_initial, &escaped );
+			fprintf( stderr, "%s",
+				escaped.bv_val );
+			ber_memfree( escaped.bv_val );
 		}
 		if ( f->f_sub_any != NULL ) {
 			for ( i = 0; f->f_sub_any[i] != NULL; i++ ) {
-				fprintf( stderr, "*%s", f->f_sub_any[i] );
+				escape_value( f->f_sub_any[i], &escaped );
+				fprintf( stderr, "*%s",
+					escaped.bv_val );
+				ber_memfree( escaped.bv_val );
 			}
 		}
-		charray_free( f->f_sub_any );
 		if ( f->f_sub_final != NULL ) {
-			fprintf( stderr, "*%s", f->f_sub_final );
+			escape_value( f->f_sub_final, &escaped );
+			fprintf( stderr,
+				"*%s", escaped.bv_val );
+			ber_memfree( escaped.bv_val );
 		}
+		fprintf( stderr, /*(*/ ")" );
 		break;
 
 	case LDAP_FILTER_PRESENT:
-		fprintf( stderr, "%s=*", f->f_type );
+		fprintf( stderr, "(%s=*)",
+			f->f_desc->ad_cname->bv_val );
 		break;
 
 	case LDAP_FILTER_AND:
 	case LDAP_FILTER_OR:
 	case LDAP_FILTER_NOT:
-		fprintf( stderr, "(%c", f->f_choice == LDAP_FILTER_AND ? '&' :
+		fprintf( stderr, "(%c" /*)*/,
+			f->f_choice == LDAP_FILTER_AND ? '&' :
 		    f->f_choice == LDAP_FILTER_OR ? '|' : '!' );
 		for ( p = f->f_list; p != NULL; p = p->f_next ) {
 			filter_print( p );
 		}
-		fprintf( stderr, ")" );
+		fprintf( stderr, /*(*/ ")" );
+		break;
+
+	case SLAPD_FILTER_COMPUTED:
+		fprintf( stderr, "(?=%s)",
+			f->f_result == LDAP_COMPARE_FALSE ? "false" :
+			f->f_result == LDAP_COMPARE_TRUE ? "true" :
+			f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" :
+			"error" );
 		break;
 
 	default:
-		fprintf( stderr, "unknown type %lu", f->f_choice );
+		fprintf( stderr, "(unknown-filter=%lu)", f->f_choice );
 		break;
 	}
 }
 
 #endif /* ldap_debug */
+
+int escape_value(
+	struct berval *in,
+	struct berval *out )
+{
+	ber_len_t i;
+	assert( in );
+	assert( out );
+
+	out->bv_val = (char *) ch_malloc( ( in->bv_len * 3 ) + 1 );
+	out->bv_len = 0;
+
+#undef NIBBLE
+#undef ESCAPE_LO
+#undef ESCAPE_HI
+#define NIBBLE(c) ((c)&0x0f)
+#define ESCAPE_LO(c) ( NIBBLE(c) + ( NIBBLE(c) < 10 ? '0' : 'A' - 10 ) )
+#define ESCAPE_HI(c) ( ESCAPE_LO((c)>>4) )
+
+	for( i=0; i < in->bv_len ; i++ ) {
+		if( FILTER_ESCAPE(in->bv_val[i]) ) {
+			out->bv_val[out->bv_len++] = '\\';
+			out->bv_val[out->bv_len++] = ESCAPE_HI( in->bv_val[i] );
+			out->bv_val[out->bv_len++] = ESCAPE_LO( in->bv_val[i] );
+		} else {
+			out->bv_val[out->bv_len++] = in->bv_val[i];
+		}
+	}
+
+	out->bv_val[out->bv_len] = '\0';
+	return LDAP_SUCCESS;
+}
+
+