X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffilter.c;h=7ebb83100afa5a3a803539ae4593a8c08d5d0471;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=dee21977612f3cdafa8902480658c70d7e48a69e;hpb=f5f039739815622a2105ccf0848e44e6d82a3303;p=openldap

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index dee2197761..7ebb83100a 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -1,7 +1,7 @@
 /* filter.c - routines for parsing and dealing with filters */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,14 +18,14 @@ static int	get_filter_list(
 	Connection *conn,
 	BerElement *ber,
 	Filter **f,
-	char **fstr,
+	struct berval *fstr,
 	const char **text );
 
 static int	get_substring_filter(
 	Connection *conn,
 	BerElement *ber,
 	Filter *f,
-	char **fstr,
+	struct berval *fstr,
 	const char **text );
 
 static int filter_escape_value(
@@ -37,14 +37,14 @@ get_filter(
 	Connection *conn,
 	BerElement *ber,
 	Filter **filt,
-	char **fstr,
+	struct berval *fstr,
 	const char **text )
 {
 	ber_tag_t	tag;
 	ber_len_t	len;
 	int		err;
 	Filter		*f;
-	char		*ftmp = NULL;
+	struct berval	ftmp = { 0, NULL };
 	struct berval escaped;
 
 #ifdef NEW_LOGGING
@@ -97,7 +97,7 @@ get_filter(
 	f->f_next = NULL;
 
 	err = LDAP_SUCCESS;
-	*fstr = NULL;
+	*fstr = ftmp;
 	f->f_choice = tag; 
 
 	switch ( f->f_choice ) {
@@ -115,13 +115,15 @@ get_filter(
 
 		assert( f->f_ava != NULL );
 
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 
-		*fstr = ch_malloc( sizeof("(=)")
+		fstr->bv_len = sizeof("(=)")-1
 			+ f->f_av_desc->ad_cname.bv_len
-			+ escaped.bv_len );
+			+ escaped.bv_len;
 
-		sprintf( *fstr, "(%s=%s)",
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+
+		sprintf( fstr->bv_val, "(%s=%s)",
 			f->f_av_desc->ad_cname.bv_val,
 		    escaped.bv_val );
 
@@ -150,13 +152,15 @@ get_filter(
 			break;
 		}
 
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 
-		*fstr = ch_malloc( sizeof("(>=)")
+		fstr->bv_len = sizeof("(>=)")-1
 			+ f->f_av_desc->ad_cname.bv_len
-			+ escaped.bv_len );
+			+ escaped.bv_len;
+
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
 
-		sprintf( *fstr, "(%s>=%s)",
+		sprintf( fstr->bv_val, "(%s>=%s)",
 			f->f_av_desc->ad_cname.bv_val,
 		    escaped.bv_val );
 
@@ -176,13 +180,15 @@ get_filter(
 		}
 
 
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 
-		*fstr = ch_malloc( sizeof("(<=)")
+		fstr->bv_len = sizeof("(<=)")-1
 			+ f->f_av_desc->ad_cname.bv_len
-			+ escaped.bv_len );
+			+ escaped.bv_len;
 
-		sprintf( *fstr, "(%s<=%s)",
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+
+		sprintf( fstr->bv_val, "(%s<=%s)",
 			f->f_av_desc->ad_cname.bv_val,
 		    escaped.bv_val );
 
@@ -198,7 +204,7 @@ get_filter(
 #else
 		Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
 #endif
-		if ( ber_scanf( ber, "o", &type ) == LBER_ERROR ) {
+		if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {
 			err = SLAPD_DISCONNECT;
 			*text = "error decoding filter";
 			break;
@@ -210,18 +216,17 @@ get_filter(
 		if( err != LDAP_SUCCESS ) {
 			/* unrecognized attribute description or other error */
 			f->f_choice = SLAPD_FILTER_COMPUTED;
-			f->f_result = SLAPD_COMPARE_FALSE;
-			*fstr = ch_strdup( "(unrecogized=*)" );
-			ch_free( type.bv_val );
+			f->f_result = LDAP_COMPARE_FALSE;
+			ber_str2bv("(unrecognized=*)",
+				sizeof("(unrecognized=*)")-1, 1, fstr);
 			err = LDAP_SUCCESS;
 			break;
 		}
 
-		ch_free( type.bv_val );
-
-		*fstr = ch_malloc( sizeof("(=*)")
-			+ f->f_desc->ad_cname.bv_len );
-		sprintf( *fstr, "(%s=*)",
+		fstr->bv_len = sizeof("(=*)") - 1 
+			+ f->f_desc->ad_cname.bv_len;
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1);
+		sprintf( fstr->bv_val, "(%s=*)",
 			f->f_desc->ad_cname.bv_val );
 
 		} break;
@@ -238,13 +243,14 @@ get_filter(
 			break;
 		}
 
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 
-		*fstr = ch_malloc( sizeof("(~=)")
+		fstr->bv_len = sizeof("(~=)") - 1
 			+ f->f_av_desc->ad_cname.bv_len
-			+ escaped.bv_len );
+			+ escaped.bv_len;
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1);
 
-		sprintf( *fstr, "(%s~=%s)",
+		sprintf( fstr->bv_val, "(%s~=%s)",
 			f->f_av_desc->ad_cname.bv_val,
 		    escaped.bv_val );
 
@@ -262,10 +268,10 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
-		*fstr = ch_malloc( sizeof("(&)")
-			+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) );
-		sprintf( *fstr, "(&%s)",
-			ftmp == NULL ? "" : ftmp );
+		fstr->bv_len = sizeof("(&)") - 1 + ftmp.bv_len;
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+		sprintf( fstr->bv_val, "(&%s)",
+			ftmp.bv_len ? ftmp.bv_val : "" );
 		break;
 
 	case LDAP_FILTER_OR:
@@ -279,10 +285,10 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
-		*fstr = ch_malloc( sizeof("(!)")
-			+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) );
-		sprintf( *fstr, "(|%s)",
-			ftmp == NULL ? "" : ftmp );
+		fstr->bv_len = sizeof("(|)") - 1 + ftmp.bv_len;
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+		sprintf( fstr->bv_val, "(|%s)",
+			ftmp.bv_len ? ftmp.bv_val : "" );
 		break;
 
 	case LDAP_FILTER_NOT:
@@ -297,10 +303,10 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
-		*fstr = ch_malloc( sizeof("(!)")
-			+ ( ftmp == NULL ? 0 : strlen( ftmp ) ) );
-		sprintf( *fstr, "(!%s)",
-			ftmp == NULL ? "" : ftmp );
+		fstr->bv_len = sizeof("(!)") - 1 + ftmp.bv_len;
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+		sprintf( fstr->bv_val, "(!%s)",
+			ftmp.bv_len ? ftmp.bv_val : "" );
 		break;
 
 	case LDAP_FILTER_EXT:
@@ -318,18 +324,19 @@ get_filter(
 
 		assert( f->f_mra != NULL );
 
-		filter_escape_value( f->f_mr_value, &escaped );
+		filter_escape_value( &f->f_mr_value, &escaped );
 
-		*fstr = ch_malloc( sizeof("(:dn::=)")
+		fstr->bv_len = sizeof("(:dn::=)") - 1
 			+ (f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_len : 0)
-			+ (f->f_mr_rule_text ? strlen(f->f_mr_rule_text) : 0)
-			+ escaped.bv_len );
+			+ f->f_mr_rule_text.bv_len
+			+ escaped.bv_len;
 
-		sprintf( *fstr, "(%s%s%s%s:=%s)",
+		fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+		sprintf( fstr->bv_val, "(%s%s%s%s:=%s)",
 			 (f->f_mr_desc ? f->f_mr_desc->ad_cname.bv_val : ""),
 			 (f->f_mr_dnattrs ? ":dn" : ""),
-			 (f->f_mr_rule_text ? ":" : ""),
-			 (f->f_mr_rule_text ? f->f_mr_rule_text : ""),
+			 (f->f_mr_rule_text.bv_len ? ":" : ""),
+			 (f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : ""),
 			 escaped.bv_val );
 
 		ber_memfree( escaped.bv_val );
@@ -347,22 +354,24 @@ get_filter(
 #endif
 		f->f_choice = SLAPD_FILTER_COMPUTED;
 		f->f_result = SLAPD_COMPARE_UNDEFINED;
-		*fstr = ch_strdup( "(undefined)" );
+		ber_str2bv( "(undefined)", sizeof("(undefined)") - 1,
+			1, fstr );
 		break;
 	}
 
-	free( ftmp );
+	if ( ftmp.bv_val ) free( ftmp.bv_val );
 
 	if ( err != LDAP_SUCCESS ) {
-		if ( *fstr != NULL ) {
-			free( *fstr );
+		if ( fstr->bv_val != NULL ) {
+			free( fstr->bv_val );
 		}
 
 		if( err != SLAPD_DISCONNECT ) {
 			/* ignore error */
 			f->f_choice = SLAPD_FILTER_COMPUTED;
 			f->f_result = SLAPD_COMPARE_UNDEFINED;
-			*fstr = ch_strdup( "(badfilter)" );
+			ber_str2bv( "(badfilter)", sizeof("(badfilter)") - 1,
+				1, fstr );
 			err = LDAP_SUCCESS;
 			*filt = f;
 
@@ -384,14 +393,15 @@ get_filter(
 
 static int
 get_filter_list( Connection *conn, BerElement *ber,
-	Filter **f, char **fstr,
+	Filter **f, struct berval *fstr,
 	const char **text )
 {
 	Filter		**new;
 	int		err;
 	ber_tag_t	tag;
 	ber_len_t	len;
-	char		*last, *ftmp;
+	char		*last;
+	struct berval	ftmp;
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
@@ -399,7 +409,6 @@ get_filter_list( Connection *conn, BerElement *ber,
 #else
 	Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
 #endif
-	*fstr = NULL;
 	new = f;
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
 	    tag = ber_next_element( ber, &len, last ) )
@@ -408,13 +417,15 @@ get_filter_list( Connection *conn, BerElement *ber,
 		if ( err != LDAP_SUCCESS )
 			return( err );
 
-		if ( *fstr == NULL ) {
+		if ( !fstr->bv_len ) {
 			*fstr = ftmp;
 		} else {
-			*fstr = ch_realloc( *fstr, strlen( *fstr ) +
-			    strlen( ftmp ) + 1 );
-			strcat( *fstr, ftmp );
-			free( ftmp );
+			int i = fstr->bv_len;
+			fstr->bv_len += ftmp.bv_len;
+			fstr->bv_val = ch_realloc( fstr->bv_val,
+				fstr->bv_len + 1 );
+			strcpy( fstr->bv_val+i, ftmp.bv_val );
+			free( ftmp.bv_val );
 		}
 		new = &(*new)->f_next;
 	}
@@ -434,18 +445,17 @@ get_substring_filter(
     Connection	*conn,
     BerElement	*ber,
     Filter	*f,
-    char	**fstr,
+    struct berval	*fstr,
 	const char	**text
 )
 {
 	ber_tag_t	tag;
 	ber_len_t	len;
 	ber_tag_t	rc;
-	struct berval *value;
+	struct berval value;
 	struct berval escaped;
 	char		*last;
-	struct berval type;
-	struct berval *nvalue;
+	struct berval bv;
 	*text = "error decoding filter";
 
 #ifdef NEW_LOGGING
@@ -454,48 +464,44 @@ get_substring_filter(
 #else
 	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 #endif
-	if ( ber_scanf( ber, "{o" /*}*/, &type ) == LBER_ERROR ) {
+	if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) {
 		return SLAPD_DISCONNECT;
 	}
 
 	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 );
+	rc = slap_bv2ad( &bv, &f->f_sub_desc, text );
 
 	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)" );
+		ber_str2bv( "(undefined)", sizeof("(undefined)")-1, 1, fstr );
 		return LDAP_SUCCESS;
 	}
 
-	f->f_sub_initial = NULL;
+	f->f_sub_initial.bv_val = NULL;
 	f->f_sub_any = NULL;
-	f->f_sub_final = NULL;
+	f->f_sub_final.bv_val = NULL;
 
-	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 );
-	}
+	fstr->bv_len = sizeof("(=" /*)*/) - 1 +
+		f->f_sub_desc->ad_cname.bv_len;
+	fstr->bv_val = ch_malloc( fstr->bv_len + 1 );
+	sprintf( fstr->bv_val, "(%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 ) )
 	{
 		unsigned usage;
 
-		rc = ber_scanf( ber, "O", &value );
+		rc = ber_scanf( ber, "m", &value );
 		if ( rc == LBER_ERROR ) {
 			rc = SLAPD_DISCONNECT;
 			goto return_error;
 		}
 
-		if ( value == NULL || value->bv_len == 0 ) {
-			ber_bvfree( value );
+		if ( value.bv_val == NULL || value.bv_len == 0 ) {
 			rc = LDAP_INVALID_SYNTAX;
 			goto return_error;
 		} 
@@ -525,18 +531,16 @@ get_substring_filter(
 				"  unknown substring choice=%ld\n",
 				(long) tag, 0, 0 );
 #endif
-			ber_bvfree( value );
 			goto return_error;
 		}
 
-		rc = value_normalize( f->f_sub_desc, usage, value, &nvalue, text );
-		ber_bvfree( value );
+		rc = value_normalize( f->f_sub_desc, usage, &value, &bv, text );
 
 		if( rc != LDAP_SUCCESS ) {
 			goto return_error;
 		}
 
-		value = nvalue;
+		value = bv;
 
 		rc = LDAP_PROTOCOL_ERROR;
 
@@ -550,21 +554,23 @@ get_substring_filter(
 			Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
 #endif
 
-			if ( f->f_sub_initial != NULL
+			if ( f->f_sub_initial.bv_val != NULL
 				|| f->f_sub_any != NULL 
-				|| f->f_sub_final != NULL )
+				|| f->f_sub_final.bv_val != NULL )
 			{
-				ber_bvfree( value );
+				free( value.bv_val );
 				goto return_error;
 			}
 
 			f->f_sub_initial = value;
 
-			if( fstr ) {
-				filter_escape_value( value, &escaped );
-				*fstr = ch_realloc( *fstr,
-					strlen( *fstr ) + escaped.bv_len + 1 );
-				strcat( *fstr, escaped.bv_val );
+			if( fstr->bv_val ) {
+				int i = fstr->bv_len;
+				filter_escape_value( &value, &escaped );
+				fstr->bv_len += escaped.bv_len;
+				fstr->bv_val = ch_realloc( fstr->bv_val,
+					fstr->bv_len + 1 );
+				strcpy( fstr->bv_val+i, escaped.bv_val );
 				ber_memfree( escaped.bv_val );
 			}
 			break;
@@ -578,22 +584,21 @@ get_substring_filter(
 			Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
 #endif
 
-			if ( f->f_sub_final != NULL ) {
-				ber_bvfree( value );
+			if ( f->f_sub_final.bv_val != NULL ) {
+				free( value.bv_val );
 				goto return_error;
 			}
 
-			if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) {
-				ber_bvfree( value );
-				goto return_error;
-			}
+			bvarray_add( &f->f_sub_any, &value );
 
-			if( fstr ) {
-				filter_escape_value( value, &escaped );
-				*fstr = ch_realloc( *fstr,
-					strlen( *fstr ) + escaped.bv_len + 2 );
-				strcat( *fstr, "*" );
-				strcat( *fstr, escaped.bv_val );
+			if( fstr->bv_val ) {
+				int i = fstr->bv_len;
+				filter_escape_value( &value, &escaped );
+				fstr->bv_len += escaped.bv_len + 2;
+				fstr->bv_val = ch_realloc( fstr->bv_val,
+					fstr->bv_len + 1 );
+				strcpy( fstr->bv_val+i, "*" );
+				strcpy( fstr->bv_val+i+1, escaped.bv_val );
 				ber_memfree( escaped.bv_val );
 			}
 			break;
@@ -607,19 +612,21 @@ get_substring_filter(
 			Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
 #endif
 
-			if ( f->f_sub_final != NULL ) {
-				ber_bvfree( value );
+			if ( f->f_sub_final.bv_val != NULL ) {
+				free( value.bv_val );
 				goto return_error;
 			}
 
 			f->f_sub_final = value;
 
-			if( fstr ) {
-				filter_escape_value( value, &escaped );
-				*fstr = ch_realloc( *fstr,
-					strlen( *fstr ) + escaped.bv_len + 2 );
-				strcat( *fstr, "*" );
-				strcat( *fstr, escaped.bv_val );
+			if( fstr->bv_val ) {
+				int i = fstr->bv_len;
+				filter_escape_value( &value, &escaped );
+				fstr->bv_len += escaped.bv_len + 2;
+				fstr->bv_val = ch_realloc( fstr->bv_val,
+					fstr->bv_len + 1 );
+				strcpy( fstr->bv_val+i, "*" );
+				strcpy( fstr->bv_val+i+1, escaped.bv_val );
 				ber_memfree( escaped.bv_val );
 			}
 			break;
@@ -635,7 +642,7 @@ get_substring_filter(
 				(long) tag, 0, 0 );
 #endif
 
-			ber_bvfree( value );
+			free( value.bv_val );
 
 return_error:
 #ifdef NEW_LOGGING
@@ -646,25 +653,29 @@ return_error:
 			Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
 				(long) rc, 0, 0 );
 #endif
-			if( fstr ) {
-				free( *fstr );
-				*fstr = NULL;
+			if( fstr->bv_val ) {
+				free( fstr->bv_val );
+				fstr->bv_val = NULL;
+				fstr->bv_len = 0;
 			}
 
-			ber_bvfree( f->f_sub_initial );
-			ber_bvecfree( f->f_sub_any );
-			ber_bvfree( f->f_sub_final );
+			free( f->f_sub_initial.bv_val );
+			bvarray_free( f->f_sub_any );
+			free( f->f_sub_final.bv_val );
 			ch_free( f->f_sub );
 			return rc;
 		}
 	}
 
-	if( fstr ) {
-		*fstr = ch_realloc( *fstr, strlen( *fstr ) + 3 );
-		if ( f->f_sub_final == NULL ) {
-			strcat( *fstr, "*" );
+	if( fstr->bv_val ) {
+		int i = fstr->bv_len;
+		fstr->bv_len += 3;
+		fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 3 );
+		if ( f->f_sub_final.bv_val == NULL ) {
+			strcpy( fstr->bv_val+i, "*" );
+			i++;
 		}
-		strcat( *fstr, /*(*/ ")" );
+		strcpy( fstr->bv_val+i, /*(*/ ")" );
 	}
 
 #ifdef NEW_LOGGING
@@ -697,12 +708,12 @@ filter_free( Filter *f )
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
-		if ( f->f_sub_initial != NULL ) {
-			ber_bvfree( f->f_sub_initial );
+		if ( f->f_sub_initial.bv_val != NULL ) {
+			free( f->f_sub_initial.bv_val );
 		}
-		ber_bvecfree( f->f_sub_any );
-		if ( f->f_sub_final != NULL ) {
-			ber_bvfree( f->f_sub_final );
+		bvarray_free( f->f_sub_any );
+		if ( f->f_sub_final.bv_val != NULL ) {
+			free( f->f_sub_final.bv_val );
 		}
 		ch_free( f->f_sub );
 		break;
@@ -716,6 +727,10 @@ filter_free( Filter *f )
 		}
 		break;
 
+	case LDAP_FILTER_EXT:
+		mra_free( f->f_mra, 1 );
+		break;
+
 	case SLAPD_FILTER_COMPUTED:
 		break;
 
@@ -747,7 +762,7 @@ filter_print( Filter *f )
 
 	switch ( f->f_choice ) {
 	case LDAP_FILTER_EQUALITY:
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 		fprintf( stderr, "(%s=%s)",
 			f->f_av_desc->ad_cname.bv_val,
 		    escaped.bv_val );
@@ -755,7 +770,7 @@ filter_print( Filter *f )
 		break;
 
 	case LDAP_FILTER_GE:
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 		fprintf( stderr, "(%s>=%s)",
 			f->f_av_desc->ad_cname.bv_val,
 		    escaped.bv_val );
@@ -763,7 +778,7 @@ filter_print( Filter *f )
 		break;
 
 	case LDAP_FILTER_LE:
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 		fprintf( stderr, "(%s<=%s)",
 			f->f_ava->aa_desc->ad_cname.bv_val,
 		    escaped.bv_val );
@@ -771,7 +786,7 @@ filter_print( Filter *f )
 		break;
 
 	case LDAP_FILTER_APPROX:
-		filter_escape_value( f->f_av_value, &escaped );
+		filter_escape_value( &f->f_av_value, &escaped );
 		fprintf( stderr, "(%s~=%s)",
 			f->f_ava->aa_desc->ad_cname.bv_val,
 		    escaped.bv_val );
@@ -781,22 +796,22 @@ filter_print( Filter *f )
 	case LDAP_FILTER_SUBSTRINGS:
 		fprintf( stderr, "(%s=" /*)*/,
 			f->f_sub_desc->ad_cname.bv_val );
-		if ( f->f_sub_initial != NULL ) {
-			filter_escape_value( f->f_sub_initial, &escaped );
+		if ( f->f_sub_initial.bv_val != NULL ) {
+			filter_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++ ) {
-				filter_escape_value( f->f_sub_any[i], &escaped );
+			for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) {
+				filter_escape_value( &f->f_sub_any[i], &escaped );
 				fprintf( stderr, "*%s",
 					escaped.bv_val );
 				ber_memfree( escaped.bv_val );
 			}
 		}
-		if ( f->f_sub_final != NULL ) {
-			filter_escape_value( f->f_sub_final, &escaped );
+		if ( f->f_sub_final.bv_val != NULL ) {
+			filter_escape_value( &f->f_sub_final, &escaped );
 			fprintf( stderr,
 				"*%s", escaped.bv_val );
 			ber_memfree( escaped.bv_val );
@@ -837,7 +852,7 @@ filter_print( Filter *f )
 
 #endif /* ldap_debug */
 
-int filter_escape_value(
+static int filter_escape_value(
 	struct berval *in,
 	struct berval *out )
 {