--- servers/slapd/filter.c	2002/01/04 20:17:46	1.69
+++ servers/slapd/filter.c	2002/03/04 21:26:47	1.74
@@ -1,5 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.68 2001/12/31 05:44:36 hyc Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.73 2002/03/01 17:52:45 kurt Exp $ */
 /*
  * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -204,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;
@@ -219,13 +219,10 @@ get_filter(
 			f->f_result = LDAP_COMPARE_FALSE;
 			ber_str2bv("(unrecognized=*)",
 				sizeof("(unrecognized=*)")-1, 1, fstr);
-			ch_free( type.bv_val );
 			err = LDAP_SUCCESS;
 			break;
 		}
 
-		ch_free( type.bv_val );
-
 		fstr->bv_len = sizeof("(=*)") - 1 
 			+ f->f_desc->ad_cname.bv_len;
 		fstr->bv_val = ch_malloc( fstr->bv_len + 1);
@@ -284,7 +281,7 @@ get_filter(
 #else
 		Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
 #endif
-		err = get_filter_list( conn, ber, &f->f_and, &ftmp, text );
+		err = get_filter_list( conn, ber, &f->f_or, &ftmp, text );
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
@@ -467,7 +464,7 @@ get_substring_filter(
 #else
 	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 #endif
-	if ( ber_scanf( ber, "{o" /*}*/, &bv ) == LBER_ERROR ) {
+	if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) {
 		return SLAPD_DISCONNECT;
 	}
 
@@ -475,8 +472,6 @@ get_substring_filter(
 	f->f_sub_desc = NULL;
 	rc = slap_bv2ad( &bv, &f->f_sub_desc, text );
 
-	ch_free( bv.bv_val );
-
 	if( rc != LDAP_SUCCESS ) {
 		text = NULL;
 		ch_free( f->f_sub );
@@ -500,7 +495,7 @@ get_substring_filter(
 	{
 		unsigned usage;
 
-		rc = ber_scanf( ber, "o", &value );
+		rc = ber_scanf( ber, "m", &value );
 		if ( rc == LBER_ERROR ) {
 			rc = SLAPD_DISCONNECT;
 			goto return_error;
@@ -536,13 +531,18 @@ get_substring_filter(
 				"  unknown substring choice=%ld\n",
 				(long) tag, 0, 0 );
 #endif
-			free( value.bv_val );
 			goto return_error;
 		}
 
-		rc = value_normalize( f->f_sub_desc, usage, &value, &bv, text );
-		free( value.bv_val );
+		/* valiate using equality matching rule validator! */
+		rc = value_validate( f->f_sub_desc->ad_type->sat_equality,
+			&value, text );
+		if( rc != LDAP_SUCCESS ) {
+			goto return_error;
+		}
 
+		rc = value_normalize( f->f_sub_desc, usage,
+			&value, &bv, text );
 		if( rc != LDAP_SUCCESS ) {
 			goto return_error;
 		}
@@ -596,7 +596,7 @@ get_substring_filter(
 				goto return_error;
 			}
 
-			bvarray_add( &f->f_sub_any, &value );
+			ber_bvarray_add( &f->f_sub_any, &value );
 
 			if( fstr->bv_val ) {
 				int i = fstr->bv_len;
@@ -667,7 +667,7 @@ return_error:
 			}
 
 			free( f->f_sub_initial.bv_val );
-			bvarray_free( f->f_sub_any );
+			ber_bvarray_free( f->f_sub_any );
 			free( f->f_sub_final.bv_val );
 			ch_free( f->f_sub );
 			return rc;
@@ -718,7 +718,7 @@ filter_free( Filter *f )
 		if ( f->f_sub_initial.bv_val != NULL ) {
 			free( f->f_sub_initial.bv_val );
 		}
-		bvarray_free( f->f_sub_any );
+		ber_bvarray_free( f->f_sub_any );
 		if ( f->f_sub_final.bv_val != NULL ) {
 			free( f->f_sub_final.bv_val );
 		}
@@ -734,6 +734,10 @@ filter_free( Filter *f )
 		}
 		break;
 
+	case LDAP_FILTER_EXT:
+		mra_free( f->f_mra, 1 );
+		break;
+
 	case SLAPD_FILTER_COMPUTED:
 		break;