--- servers/slapd/filter.c	1999/09/10 20:25:30	1.13.4.2
+++ servers/slapd/filter.c	2000/02/29 22:48:01	1.24
@@ -1,5 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.16 1999/09/08 17:06:33 kdz Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.23 2000/02/14 19:57:40 kurt Exp $ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -20,6 +20,7 @@ static int	get_substring_filter(Connecti
 int
 get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
 {
+	ber_tag_t	tag;
 	ber_len_t	len;
 	int		err;
 	Filter		*f;
@@ -60,14 +61,23 @@ get_filter( Connection *conn, BerElement
 	 *
 	 */
 
+	tag = ber_peek_tag( ber, &len );
+
+	if( tag == LBER_ERROR ) {
+		return SLAPD_DISCONNECT;
+	}
+
 	f = (Filter *) ch_malloc( sizeof(Filter) );
 	f->f_next = NULL;
 
 	err = LDAP_SUCCESS;
 	*fstr = NULL;
-	f->f_choice = ber_peek_tag( ber, &len );
+	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 ) {
@@ -106,13 +116,14 @@ get_filter( Connection *conn, BerElement
 	case LDAP_FILTER_PRESENT:
 		Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
 		if ( ber_scanf( ber, "a", &f->f_type ) == LBER_ERROR ) {
-			err = -1;
-		} else {
-			err = LDAP_SUCCESS;
-			attr_normalize( f->f_type );
-			*fstr = ch_malloc( 5 + strlen( f->f_type ) );
-			sprintf( *fstr, "(%s=*)", f->f_type );
+			err = SLAPD_DISCONNECT;
+			break;
 		}
+
+		err = LDAP_SUCCESS;
+		attr_normalize( f->f_type );
+		*fstr = ch_malloc( 5 + strlen( f->f_type ) );
+		sprintf( *fstr, "(%s=*)", f->f_type );
 		break;
 
 	case LDAP_FILTER_APPROX:
@@ -124,6 +135,7 @@ get_filter( Connection *conn, BerElement
 			    f->f_avvalue.bv_val );
 		}
 		break;
+#endif
 
 	case LDAP_FILTER_AND:
 		Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
@@ -158,10 +170,11 @@ get_filter( Connection *conn, BerElement
 		}
 		break;
 
-	case LBER_DEFAULT:
-		Debug( LDAP_DEBUG_ANY, "decoding filter error\n",
-		       0, 0, 0 );
-		err = -1;
+	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;
 		break;
 
 	default:
@@ -218,6 +231,8 @@ get_filter_list( Connection *conn, BerEl
 	return( LDAP_SUCCESS );
 }
 
+#ifndef SLAPD_SCHEMA_NOT_COMPAT
+
 static int
 get_substring_filter(
     Connection	*conn,
@@ -229,86 +244,143 @@ get_substring_filter(
 	ber_tag_t	tag;
 	ber_len_t	len;
 	ber_tag_t	rc;
-	char		*val, *last;
+	struct berval *val;
+	char		*last;
 	int		syntax;
 
 	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
 
 	if ( ber_scanf( ber, "{a" /*}*/, &f->f_sub_type ) == LBER_ERROR ) {
-		return( -1 );
+		return SLAPD_DISCONNECT;
 	}
+
 	attr_normalize( f->f_sub_type );
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+	/* not yet implemented */
+#else
+	/* should get real syntax and see if we have a substring matching rule */
 	syntax = attr_syntax( f->f_sub_type );
+#endif
+
 	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( strlen( f->f_sub_type ) + 3 );
+		sprintf( *fstr, "(%s=" /*)*/, f->f_sub_type );
+	}
+
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
 	    tag = ber_next_element( ber, &len, last ) )
 	{
-		rc = ber_scanf( ber, "a", &val );
+		rc = ber_scanf( ber, "O", &val );
 		if ( rc == LBER_ERROR ) {
-			return( -1 );
+			rc = SLAPD_DISCONNECT;
+			goto return_error;
 		}
-		if ( val == NULL || *val == '\0' ) {
-			if ( val != NULL ) {
-				free( val );
-			}
-			return( LDAP_INVALID_SYNTAX );
-		}
-		value_normalize( val, syntax );
+
+		if ( val == NULL || val->bv_len == 0 ) {
+			ber_bvfree( val );
+			rc = LDAP_INVALID_SYNTAX;
+			goto return_error;
+		} 
+
+		rc = LDAP_PROTOCOL_ERROR;
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		/* not yet implemented */
+#else
+		/* we should call a substring syntax normalization routine */
+		value_normalize( val->bv_val, syntax );
+		/* this is bogus, value_normalize should take a berval */
+		val->bv_len = strlen( val->bv_val );
+#endif
 
 		switch ( tag ) {
 		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( val );
+				goto return_error;
 			}
 			f->f_sub_initial = val;
-			*fstr = ch_realloc( *fstr, strlen( *fstr ) +
-			    strlen( val ) + 1 );
-			strcat( *fstr, val );
+
+			if( fstr ) {
+				*fstr = ch_realloc( *fstr,
+					strlen( *fstr ) + val->bv_len + 1 );
+				strcat( *fstr, val->bv_val );
+			}
 			break;
 
 		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, val ) < 0 ) {
+				ber_bvfree( val );
+				goto return_error;
+			}
+
+			if( fstr ) {
+				*fstr = ch_realloc( *fstr,
+					strlen( *fstr ) + val->bv_len + 2 );
+				strcat( *fstr, "*" );
+				strcat( *fstr, val->bv_val );
+			}
 			break;
 
 		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( val );
+				goto return_error;
 			}
 			f->f_sub_final = val;
-			*fstr = ch_realloc( *fstr, strlen( *fstr ) +
-			    strlen( val ) + 2 );
-			strcat( *fstr, "*" );
-			strcat( *fstr, val );
+
+			if( fstr ) {
+				*fstr = ch_realloc( *fstr,
+					strlen( *fstr ) + val->bv_len + 2 );
+				strcat( *fstr, "*" );
+				strcat( *fstr, val->bv_val );
+			}
 			break;
 
 		default:
 			Debug( LDAP_DEBUG_FILTER, "  unknown type\n", tag, 0,
 			    0 );
-			return( LDAP_PROTOCOL_ERROR );
+
+			ber_bvfree( val );
+
+return_error:
+			Debug( LDAP_DEBUG_FILTER, "  error=%d\n", rc, 0, 0 );
+
+			if( fstr ) {
+				free( *fstr );
+				*fstr = NULL;
+			}
+
+			ch_free( f->f_sub_type );
+			ber_bvfree( f->f_sub_initial );
+			ber_bvecfree( f->f_sub_any );
+			ber_bvfree( f->f_sub_final );
+			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( LDAP_SUCCESS );
 }
 
+#endif /* not compat */
+
 void
 filter_free( Filter *f )
 {
@@ -319,30 +391,49 @@ filter_free( Filter *f )
 	}
 
 	switch ( f->f_choice ) {
+	case LDAP_FILTER_PRESENT:
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		ad_free( f->f_desc, 1 );
+#else
+		if ( f->f_type != NULL ) {
+			free( f->f_type );
+		}
+#endif
+		break;
+
 	case LDAP_FILTER_EQUALITY:
 	case LDAP_FILTER_GE:
 	case LDAP_FILTER_LE:
 	case LDAP_FILTER_APPROX:
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		ava_free( f->f_ava, 1 );
+#else
 		ava_free( &f->f_ava, 0 );
+#endif
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		ad_free( f->f_sub_desc, 1 );
+		if ( f->f_sub_initial != NULL ) {
+			ber_bvfree( f->f_sub_initial );
+		}
+		ber_bvecfree( f->f_sub_any );
+		if ( f->f_sub_final != NULL ) {
+			ber_bvfree( f->f_sub_final );
+		}
+#else
 		if ( f->f_sub_type != NULL ) {
 			free( f->f_sub_type );
 		}
 		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 );
 		}
+#endif
 		break;
 
 	case LDAP_FILTER_AND:
@@ -354,11 +445,15 @@ filter_free( Filter *f )
 		}
 		break;
 
+	case SLAPD_FILTER_COMPUTED:
+		break;
+
 	default:
 		Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",
 		       f->f_choice, 0, 0 );
 		break;
 	}
+
 	free( f );
 }
 
@@ -371,63 +466,105 @@ filter_print( Filter *f )
 	Filter	*p;
 
 	if ( f == NULL ) {
-		fprintf( stderr, "NULL" );
+		fprintf( stderr, "No filter!" );
 	}
 
 	switch ( f->f_choice ) {
 	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 );
+#else
 		fprintf( stderr, "(%s=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
+#endif
 		break;
 
 	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 );
+#else
 		fprintf( stderr, "(%s>=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
+#endif
 		break;
 
 	case LDAP_FILTER_LE:
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		fprintf( stderr, "(%s<=%s)",
+			f->f_ava->aa_desc->ad_cname,
+		    f->f_ava->aa_value->bv_val );
+#else
 		fprintf( stderr, "(%s<=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
+#endif
 		break;
 
 	case LDAP_FILTER_APPROX:
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		fprintf( stderr, "(%s~=%s)",
+			f->f_ava->aa_desc->ad_cname,
+		    f->f_ava->aa_value->bv_val );
+#else
 		fprintf( stderr, "(%s~=%s)", f->f_ava.ava_type,
 		    f->f_ava.ava_value.bv_val );
+#endif
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
-		fprintf( stderr, "(%s=", f->f_sub_type );
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		fprintf( stderr, "(%s=" /*)*/, f->f_sub_desc->ad_cname );
+#else
+		fprintf( stderr, "(%s=" /*)*/, f->f_sub_type );
+#endif
 		if ( f->f_sub_initial != NULL ) {
-			fprintf( stderr, "%s", f->f_sub_initial );
+			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] );
+				fprintf( stderr, "*%s", f->f_sub_any[i]->bv_val );
 			}
 		}
-		charray_free( f->f_sub_any );
 		if ( f->f_sub_final != NULL ) {
-			fprintf( stderr, "*%s", f->f_sub_final );
+			fprintf( stderr, "*%s", f->f_sub_final->bv_val );
 		}
+		fprintf( stderr, /*(*/ ")" );
 		break;
 
 	case LDAP_FILTER_PRESENT:
-		fprintf( stderr, "%s=*", f->f_type );
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+		fprintf( stderr, "(%s=*)",
+			f->f_desc->ad_cname );
+#else
+		fprintf( stderr, "(%s=*)", f->f_type );
+#endif
 		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;
 	}
 }