--- servers/slapd/filter.c	2000/02/29 22:48:01	1.24
+++ servers/slapd/filter.c	2000/05/22 01:46:57	1.42
@@ -1,7 +1,7 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.23 2000/02/14 19:57:40 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.41 2000/05/21 21:15:55 kurt Exp $ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,17 +14,33 @@
 
 #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 );
 
 int
-get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
+get_filter(
+	Connection *conn,
+	BerElement *ber,
+	Filter **filt,
+	char **fstr,
+	const char **text )
 {
 	ber_tag_t	tag;
 	ber_len_t	len;
 	int		err;
 	Filter		*f;
-	char		*ftmp;
+	char		*ftmp = NULL;
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
 
@@ -64,6 +80,7 @@ get_filter( Connection *conn, BerElement
 	tag = ber_peek_tag( ber, &len );
 
 	if( tag == LBER_ERROR ) {
+		*text = "error decoding filter";
 		return SLAPD_DISCONNECT;
 	}
 
@@ -75,112 +92,223 @@ get_filter( Connection *conn, BerElement
 	f->f_choice = tag; 
 
 	switch ( f->f_choice ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	/* not yet implemented */
-#else
 	case LDAP_FILTER_EQUALITY:
 		Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
-			*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 );
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text );
+#else
+		err = get_ava( ber, &f->f_ava, text );
+#endif
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		assert( f->f_ava != NULL );
+
+		*fstr = ch_malloc( sizeof("(=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ f->f_av_value->bv_len );
+
+		sprintf( *fstr, "(%s=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    f->f_av_value->bv_val );
+
+#else
+		*fstr = ch_malloc( sizeof("(=)")
+			+ strlen( f->f_avtype )
+			+ f->f_avvalue.bv_len);
+		sprintf( *fstr, "(%s=%s)", f->f_avtype,
+		    f->f_avvalue.bv_val );
+#endif
 		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 )) == LDAP_SUCCESS ) {
-			*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 );
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
+#else
+		err = get_ava( ber, &f->f_ava, text );
+#endif
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		*fstr = ch_malloc( sizeof("(>=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ f->f_av_value->bv_len );
+
+		sprintf( *fstr, "(%s>=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    f->f_av_value->bv_val );
+
+#else
+		*fstr = ch_malloc( sizeof("(>=)")
+			+ strlen( f->f_avtype )
+			+ f->f_avvalue.bv_len);
+		sprintf( *fstr, "(%s>=%s)", f->f_avtype,
+		    f->f_avvalue.bv_val );
+#endif
 		break;
 
 	case LDAP_FILTER_LE:
 		Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
-			*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 );
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
+#else
+		err = get_ava( ber, &f->f_ava, text );
+#endif
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
+
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		*fstr = ch_malloc( sizeof("(<=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ f->f_av_value->bv_len );
+
+		sprintf( *fstr, "(%s<=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    f->f_av_value->bv_val );
+
+#else
+		*fstr = ch_malloc( sizeof("(<=)")
+			+ strlen( f->f_avtype )
+			+ f->f_avvalue.bv_len);
+		sprintf( *fstr, "(%s<=%s)", f->f_avtype,
+		    f->f_avvalue.bv_val );
+#endif
 		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 ) {
+
+		if ( ber_scanf( ber, "o", &type ) == LBER_ERROR ) {
 			err = SLAPD_DISCONNECT;
+			*text = "error decoding filter";
 			break;
 		}
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		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 );
+
+#else
+		f->f_type = type.bv_val;
 		err = LDAP_SUCCESS;
 		attr_normalize( f->f_type );
-		*fstr = ch_malloc( 5 + strlen( f->f_type ) );
+		*fstr = ch_malloc( sizeof("(=*)")
+			+ strlen( f->f_type ) );
 		sprintf( *fstr, "(%s=*)", f->f_type );
-		break;
+#endif
+		} break;
 
 	case LDAP_FILTER_APPROX:
 		Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
-		if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
-			*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 );
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY_APPROX, text );
+#else
+		err = get_ava( ber, &f->f_ava, text );
+#endif
+		if ( err != LDAP_SUCCESS ) {
+			break;
 		}
-		break;
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		*fstr = ch_malloc( sizeof("(~=)")
+			+ f->f_av_desc->ad_cname->bv_len
+			+ f->f_av_value->bv_len );
+
+		sprintf( *fstr, "(%s~=%s)",
+			f->f_av_desc->ad_cname->bv_val,
+		    f->f_av_value->bv_val );
+
+#else
+		*fstr = ch_malloc( sizeof("(~=)")
+			+ strlen( f->f_avtype )
+			+ f->f_avvalue.bv_len);
+		sprintf( *fstr, "(%s~=%s)", f->f_avtype,
+		    f->f_avvalue.bv_val );
 #endif
+		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 ))
-		    == LDAP_SUCCESS ) {
-			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 ))
-		    == LDAP_SUCCESS ) {
-			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 )) == LDAP_SUCCESS ) {
-			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 );
-		err = LDAP_PROTOCOL_ERROR;
+		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",
+		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;
 	}
 
@@ -193,12 +321,16 @@ get_filter( Connection *conn, BerElement
 		*filt = f;
 	}
 
+	free( ftmp );
+
 	Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
 	return( err );
 }
 
 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;
@@ -213,8 +345,10 @@ get_filter_list( Connection *conn, BerEl
 	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 )) != LDAP_SUCCESS )
+		err = get_filter( conn, ber, new, &ftmp, text );
+		if ( err != LDAP_SUCCESS )
 			return( err );
+
 		if ( *fstr == NULL ) {
 			*fstr = ftmp;
 		} else {
@@ -231,34 +365,51 @@ get_filter_list( Connection *conn, BerEl
 	return( LDAP_SUCCESS );
 }
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-
 static int
 get_substring_filter(
     Connection	*conn,
     BerElement	*ber,
     Filter	*f,
-    char	**fstr
+    char	**fstr,
+	const char	**text
 )
 {
 	ber_tag_t	tag;
 	ber_len_t	len;
 	ber_tag_t	rc;
-	struct berval *val;
+	struct berval *value;
 	char		*last;
+	struct berval type;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+	struct berval *nvalue;
+#else
 	int		syntax;
+#endif
+	*text = "error decoding filter";
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 
-	if ( ber_scanf( ber, "{a" /*}*/, &f->f_sub_type ) == LBER_ERROR ) {
+	if ( ber_scanf( ber, "{o" /*}*/, &type ) == LBER_ERROR ) {
 		return SLAPD_DISCONNECT;
 	}
 
-	attr_normalize( f->f_sub_type );
-
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-	/* not yet implemented */
+	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;
+		f->f_choice = SLAPD_FILTER_COMPUTED;
+		f->f_result = SLAPD_COMPARE_UNDEFINED;
+		*fstr = ch_strdup( "(undefined)" );
+		return LDAP_SUCCESS;
+	}
 #else
+	f->f_sub_type = type.bv_val;
+	attr_normalize( f->f_sub_type );
+
 	/* should get real syntax and see if we have a substring matching rule */
 	syntax = attr_syntax( f->f_sub_type );
 #endif
@@ -267,99 +418,150 @@ get_substring_filter(
 	f->f_sub_any = NULL;
 	f->f_sub_final = NULL;
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+	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 );
+	}
+#else
 	if( fstr ) {
 		*fstr = ch_malloc( strlen( f->f_sub_type ) + 3 );
 		sprintf( *fstr, "(%s=" /*)*/, f->f_sub_type );
 	}
+#endif
 
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
 	    tag = ber_next_element( ber, &len, last ) )
 	{
-		rc = ber_scanf( ber, "O", &val );
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		unsigned usage;
+#endif
+
+		rc = ber_scanf( ber, "O", &value );
 		if ( rc == LBER_ERROR ) {
 			rc = SLAPD_DISCONNECT;
 			goto return_error;
 		}
 
-		if ( val == NULL || val->bv_len == 0 ) {
-			ber_bvfree( val );
+		if ( value == NULL || value->bv_len == 0 ) {
+			ber_bvfree( value );
 			rc = LDAP_INVALID_SYNTAX;
 			goto return_error;
 		} 
 
-		rc = LDAP_PROTOCOL_ERROR;
-
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-		/* not yet implemented */
+		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 = nvalue;
 #else
+
 		/* we should call a substring syntax normalization routine */
-		value_normalize( val->bv_val, syntax );
+		value_normalize( value->bv_val, syntax );
 		/* this is bogus, value_normalize should take a berval */
-		val->bv_len = strlen( val->bv_val );
+		value->bv_len = strlen( value->bv_val );
 #endif
 
+		rc = LDAP_PROTOCOL_ERROR;
+
 		switch ( tag ) {
 		case LDAP_SUBSTRING_INITIAL:
 			Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
 			if ( f->f_sub_initial != NULL ) {
-				ber_bvfree( val );
+				ber_bvfree( value );
 				goto return_error;
 			}
-			f->f_sub_initial = val;
+
+			f->f_sub_initial = value;
 
 			if( fstr ) {
 				*fstr = ch_realloc( *fstr,
-					strlen( *fstr ) + val->bv_len + 1 );
-				strcat( *fstr, val->bv_val );
+					strlen( *fstr ) + value->bv_len + 1 );
+				strcat( *fstr, value->bv_val );
 			}
 			break;
 
 		case LDAP_SUBSTRING_ANY:
 			Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
-			if( ber_bvecadd( &f->f_sub_any, val ) < 0 ) {
-				ber_bvfree( val );
+			if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) {
+				ber_bvfree( value );
 				goto return_error;
 			}
 
 			if( fstr ) {
 				*fstr = ch_realloc( *fstr,
-					strlen( *fstr ) + val->bv_len + 2 );
+					strlen( *fstr ) + value->bv_len + 2 );
 				strcat( *fstr, "*" );
-				strcat( *fstr, val->bv_val );
+				strcat( *fstr, value->bv_val );
 			}
 			break;
 
 		case LDAP_SUBSTRING_FINAL:
 			Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
 			if ( f->f_sub_final != NULL ) {
-				ber_bvfree( val );
+				ber_bvfree( value );
 				goto return_error;
 			}
-			f->f_sub_final = val;
+			f->f_sub_final = value;
 
 			if( fstr ) {
 				*fstr = ch_realloc( *fstr,
-					strlen( *fstr ) + val->bv_len + 2 );
+					strlen( *fstr ) + value->bv_len + 2 );
 				strcat( *fstr, "*" );
-				strcat( *fstr, val->bv_val );
+				strcat( *fstr, value->bv_val );
 			}
 			break;
 
 		default:
-			Debug( LDAP_DEBUG_FILTER, "  unknown type\n", tag, 0,
-			    0 );
+			Debug( LDAP_DEBUG_FILTER,
+				"  unknown substring type=%ld\n",
+				(long) tag, 0, 0 );
 
-			ber_bvfree( val );
+			ber_bvfree( value );
 
 return_error:
-			Debug( LDAP_DEBUG_FILTER, "  error=%d\n", rc, 0, 0 );
+			Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
+				(long) rc, 0, 0 );
 
 			if( fstr ) {
 				free( *fstr );
 				*fstr = NULL;
 			}
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+			ad_free( f->f_sub_desc, 1 );
+#else
 			ch_free( f->f_sub_type );
+#endif
 			ber_bvfree( f->f_sub_initial );
 			ber_bvecfree( f->f_sub_any );
 			ber_bvfree( f->f_sub_final );
@@ -379,8 +581,6 @@ return_error:
 	return( LDAP_SUCCESS );
 }
 
-#endif /* not compat */
-
 void
 filter_free( Filter *f )
 {
@@ -449,7 +649,7 @@ filter_free( Filter *f )
 		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;
 	}
@@ -473,10 +673,11 @@ filter_print( Filter *f )
 	case LDAP_FILTER_EQUALITY:
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 		fprintf( stderr, "(%s=%s)",
-			f->f_ava->aa_desc->ad_cname,
-		    f->f_ava->aa_value->bv_val );
+			f->f_av_desc->ad_cname->bv_val,
+		    f->f_av_value->bv_val );
 #else
-		fprintf( stderr, "(%s=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s=%s)",
+			f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 #endif
 		break;
@@ -484,10 +685,11 @@ filter_print( Filter *f )
 	case LDAP_FILTER_GE:
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 		fprintf( stderr, "(%s>=%s)",
-			f->f_ava->aa_desc->ad_cname,
-		    f->f_ava->aa_value->bv_val );
+			f->f_av_desc->ad_cname->bv_val,
+		    f->f_av_value->bv_val );
 #else
-		fprintf( stderr, "(%s>=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s>=%s)",
+			f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 #endif
 		break;
@@ -495,10 +697,11 @@ filter_print( Filter *f )
 	case LDAP_FILTER_LE:
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 		fprintf( stderr, "(%s<=%s)",
-			f->f_ava->aa_desc->ad_cname,
+			f->f_ava->aa_desc->ad_cname->bv_val,
 		    f->f_ava->aa_value->bv_val );
 #else
-		fprintf( stderr, "(%s<=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s<=%s)",
+			f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 #endif
 		break;
@@ -506,30 +709,36 @@ filter_print( Filter *f )
 	case LDAP_FILTER_APPROX:
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 		fprintf( stderr, "(%s~=%s)",
-			f->f_ava->aa_desc->ad_cname,
+			f->f_ava->aa_desc->ad_cname->bv_val,
 		    f->f_ava->aa_value->bv_val );
 #else
-		fprintf( stderr, "(%s~=%s)", f->f_ava.ava_type,
+		fprintf( stderr, "(%s~=%s)",
+			f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
 #endif
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-		fprintf( stderr, "(%s=" /*)*/, f->f_sub_desc->ad_cname );
+		fprintf( stderr, "(%s=" /*)*/,
+			f->f_sub_desc->ad_cname->bv_val );
 #else
-		fprintf( stderr, "(%s=" /*)*/, f->f_sub_type );
+		fprintf( stderr, "(%s=" /*)*/,
+			f->f_sub_type );
 #endif
 		if ( f->f_sub_initial != NULL ) {
-			fprintf( stderr, "%s", f->f_sub_initial->bv_val );
+			fprintf( stderr, "%s",
+				f->f_sub_initial->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]->bv_val );
+				fprintf( stderr, "*%s",
+					f->f_sub_any[i]->bv_val );
 			}
 		}
 		if ( f->f_sub_final != NULL ) {
-			fprintf( stderr, "*%s", f->f_sub_final->bv_val );
+			fprintf( stderr,
+				"*%s", f->f_sub_final->bv_val );
 		}
 		fprintf( stderr, /*(*/ ")" );
 		break;
@@ -537,9 +746,10 @@ filter_print( Filter *f )
 	case LDAP_FILTER_PRESENT:
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 		fprintf( stderr, "(%s=*)",
-			f->f_desc->ad_cname );
+			f->f_desc->ad_cname->bv_val );
 #else
-		fprintf( stderr, "(%s=*)", f->f_type );
+		fprintf( stderr, "(%s=*)",
+			f->f_type );
 #endif
 		break;
 
@@ -556,7 +766,7 @@ filter_print( Filter *f )
 		break;
 
 	case SLAPD_FILTER_COMPUTED:
-		fprintf( stderr, "(%s)",
+		fprintf( stderr, "(?=%s)",
 			f->f_result == LDAP_COMPARE_FALSE ? "false" :
 			f->f_result == LDAP_COMPARE_TRUE ? "true" :
 			f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" :
@@ -564,7 +774,7 @@ filter_print( Filter *f )
 		break;
 
 	default:
-		fprintf( stderr, "(unknown filter %lu)", f->f_choice );
+		fprintf( stderr, "(unknown-filter=%lu)", f->f_choice );
 		break;
 	}
 }