--- servers/slapd/filter.c	2003/04/10 04:21:53	1.108
+++ servers/slapd/filter.c	2003/04/29 18:12:00	1.114
@@ -1,5 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.107 2003/04/09 21:37:00 hyc Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.113 2003/04/29 16:13:10 kurt Exp $ */
 /*
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -212,6 +212,10 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
+		if ( f.f_and == NULL ) {
+			f.f_choice = SLAPD_FILTER_COMPUTED;
+			f.f_result = LDAP_COMPARE_TRUE;
+		}
 		/* no assert - list could be empty */
 		break;
 
@@ -226,6 +230,10 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
+		if ( f.f_or == NULL ) {
+			f.f_choice = SLAPD_FILTER_COMPUTED;
+			f.f_result = LDAP_COMPARE_FALSE;
+		}
 		/* no assert - list could be empty */
 		break;
 
@@ -243,6 +251,23 @@ get_filter(
 		}
 
 		assert( f.f_not != NULL );
+		if ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {
+			f.f_choice = SLAPD_FILTER_COMPUTED;
+			f.f_result = f.f_not->f_result;
+			op->o_tmpfree( f.f_not, op->o_tmpmemctx );
+			f.f_not = NULL;
+
+			switch( f.f_result ) {
+			case LDAP_COMPARE_TRUE:
+				f.f_result = LDAP_COMPARE_FALSE;
+				break;
+			case LDAP_COMPARE_FALSE:
+				f.f_result = LDAP_COMPARE_TRUE;
+				break;
+			default: ;
+				/* (!Undefined) is Undefined */
+			}
+		}
 		break;
 
 	case LDAP_FILTER_EXT:
@@ -278,6 +303,7 @@ get_filter(
 
 	if( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {
 		/* ignore error */
+		*text = NULL;
 		f.f_choice = SLAPD_FILTER_COMPUTED;
 		f.f_result = SLAPD_COMPARE_UNDEFINED;
 		err = LDAP_SUCCESS;
@@ -372,7 +398,13 @@ get_ssa(
 	rc = slap_bv2ad( &desc, &ssa.sa_desc, text );
 
 	if( rc != LDAP_SUCCESS ) {
-		return LDAP_SUCCESS;
+		/* skip over the rest of this filter */
+		for ( tag = ber_first_element( ber, &len, &last );
+			tag != LBER_DEFAULT;
+			tag = ber_next_element( ber, &len, last ) ) {
+			ber_scanf( ber, "x" );
+		}
+		return rc;
 	}
 
 	rc = LDAP_PROTOCOL_ERROR;
@@ -426,7 +458,7 @@ get_ssa(
 		/* validate/normalize using equality matching rule validator! */
 		rc = asserted_value_validate_normalize(
 			ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,
-			usage, &value, &nvalue, text );
+			usage, &value, &nvalue, text, op->o_tmpmemctx );
 
 		if( rc != LDAP_SUCCESS ) {
 			goto return_error;
@@ -448,7 +480,7 @@ get_ssa(
 				|| ssa.sa_any != NULL 
 				|| ssa.sa_final.bv_val != NULL )
 			{
-				free( nvalue.bv_val );
+				sl_free( nvalue.bv_val, op->o_tmpmemctx );
 				goto return_error;
 			}
 
@@ -465,15 +497,11 @@ get_ssa(
 #endif
 
 			if ( ssa.sa_final.bv_val != NULL ) {
-				free( nvalue.bv_val );
+				sl_free( nvalue.bv_val, op->o_tmpmemctx );
 				goto return_error;
 			}
 
-#ifdef notyet
 			ber_bvarray_add_x( &ssa.sa_any, &nvalue, op->o_tmpmemctx );
-#else
-			ber_bvarray_add( &ssa.sa_any, &nvalue );
-#endif
 			break;
 
 		case LDAP_SUBSTRING_FINAL:
@@ -486,7 +514,7 @@ get_ssa(
 #endif
 
 			if ( ssa.sa_final.bv_val != NULL ) {
-				free( nvalue.bv_val );
+				sl_free( nvalue.bv_val, op->o_tmpmemctx );
 				goto return_error;
 			}
 
@@ -505,7 +533,7 @@ get_ssa(
 #endif
 
 			assert( 0 );
-			free( nvalue.bv_val );
+			sl_free( nvalue.bv_val, op->o_tmpmemctx );
 
 return_error:
 #ifdef NEW_LOGGING
@@ -516,9 +544,9 @@ return_error:
 			Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
 				(long) rc, 0, 0 );
 #endif
-			free( ssa.sa_initial.bv_val );
-			ber_bvarray_free( ssa.sa_any );
-			free( ssa.sa_final.bv_val );
+			sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );
+			ber_bvarray_free_x( ssa.sa_any, op->o_tmpmemctx );
+			sl_free( ssa.sa_final.bv_val, op->o_tmpmemctx );
 			return rc;
 		}
 
@@ -562,19 +590,11 @@ filter_free_x( Operation *op, Filter *f
 
 	case LDAP_FILTER_SUBSTRINGS:
 		if ( f->f_sub_initial.bv_val != NULL ) {
-#ifdef notyet
 			op->o_tmpfree( f->f_sub_initial.bv_val, op->o_tmpmemctx );
-#else
-			ch_free( f->f_sub_initial.bv_val );
-#endif
 		}
-		ber_bvarray_free( f->f_sub_any );
+		ber_bvarray_free_x( f->f_sub_any, op->o_tmpmemctx );
 		if ( f->f_sub_final.bv_val != NULL ) {
-#ifdef notyet
 			op->o_tmpfree( f->f_sub_final.bv_val, op->o_tmpmemctx );
-#else
-			ch_free( f->f_sub_final.bv_val );
-#endif
 		}
 		op->o_tmpfree( f->f_sub, op->o_tmpmemctx );
 		break;
@@ -614,8 +634,8 @@ filter_free( Filter *f )
 {
 	Operation op;
 
-	op.o_tmpmemctx = NULL;
-	op.o_tmpmfuncs = &ch_mfuncs;
+	op.o_tmpmemctx = sl_context( f );
+	op.o_tmpmfuncs = &sl_mfuncs;
 	filter_free_x( &op, f );
 }
 
@@ -818,7 +838,8 @@ filter2bv_x( Operation *op, Filter *f, s
 		break;
 
 	default:
-		ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr, op->o_tmpmemctx );
+		ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
+			1, fstr, op->o_tmpmemctx );
 		break;
 	}
 }
@@ -1150,19 +1171,11 @@ vrFilter_free( Operation *op, ValuesRetu
 
 		case LDAP_FILTER_SUBSTRINGS:
 			if ( vrf->vrf_sub_initial.bv_val != NULL ) {
-#ifdef notyet
 				op->o_tmpfree( vrf->vrf_sub_initial.bv_val, op->o_tmpmemctx );
-#else
-				ch_free( vrf->vrf_sub_initial.bv_val );
-#endif
 			}
 			ber_bvarray_free_x( vrf->vrf_sub_any, op->o_tmpmemctx );
 			if ( vrf->vrf_sub_final.bv_val != NULL ) {
-#ifdef notyet
 				op->o_tmpfree( vrf->vrf_sub_final.bv_val, op->o_tmpmemctx );
-#else
-				ch_free( vrf->vrf_sub_final.bv_val );
-#endif
 			}
 			op->o_tmpfree( vrf->vrf_sub, op->o_tmpmemctx );
 			break;
@@ -1197,7 +1210,8 @@ vrFilter2bv( Operation *op, ValuesReturn
 	ber_len_t len;
 
 	if ( vrf == NULL ) {
-		ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );
+		ber_str2bv_x( "No filter!", sizeof("No filter!")-1,
+			1, fstr, op->o_tmpmemctx );
 		return;
 	}
 
@@ -1394,198 +1408,8 @@ simple_vrFilter2bv( Operation *op, Value
 		break;
 
 	default:
-		ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr, op->o_tmpmemctx );
+		ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
+			1, fstr, op->o_tmpmemctx );
 		break;
 	}
 }
-
-#if 0 /* unused */
-static int
-get_substring_vrFilter(
-	Operation *op,
-	BerElement	*ber,
-	ValuesReturnFilter	*vrf,
-	const char	**text )
-{
-	ber_tag_t	tag;
-	ber_len_t	len;
-	ber_tag_t	rc;
-	struct berval value;
-	char		*last;
-	struct berval bv;
-	*text = "error decoding filter";
-
-#ifdef NEW_LOGGING
-	LDAP_LOG( FILTER, ENTRY, 
-		"get_substring_filter: conn %d  begin\n", op->o_connid, 0, 0 );
-#else
-	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
-#endif
-	if ( ber_scanf( ber, "{m" /*}*/, &bv ) == LBER_ERROR ) {
-		return SLAPD_DISCONNECT;
-	}
-
-	vrf->vrf_sub = ch_calloc( 1, sizeof(SubstringsAssertion) );
-	vrf->vrf_sub_desc = NULL;
-	rc = slap_bv2ad( &bv, &vrf->vrf_sub_desc, text );
-
-	if( rc != LDAP_SUCCESS ) {
-		text = NULL;
-		ch_free( vrf->vrf_sub );
-		vrf->vrf_choice = SLAPD_FILTER_COMPUTED;
-		vrf->vrf_result = SLAPD_COMPARE_UNDEFINED;
-		return LDAP_SUCCESS;
-	}
-
-	vrf->vrf_sub_initial.bv_val = NULL;
-	vrf->vrf_sub_any = NULL;
-	vrf->vrf_sub_final.bv_val = NULL;
-
-	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-		tag = ber_next_element( ber, &len, last ) )
-	{
-		unsigned usage;
-
-		rc = ber_scanf( ber, "m", &value );
-		if ( rc == LBER_ERROR ) {
-			rc = SLAPD_DISCONNECT;
-			goto return_error;
-		}
-
-		if ( value.bv_val == NULL || value.bv_len == 0 ) {
-			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;
-
-#ifdef NEW_LOGGING
-			LDAP_LOG( FILTER, ERR, 
-				"get_filter_substring: conn %d  unknown substring choice=%ld\n",
-				op->o_connid, (long)tag, 0 );
-#else
-			Debug( LDAP_DEBUG_FILTER,
-				"  unknown substring choice=%ld\n",
-				(long) tag, 0, 0 );
-#endif
-			goto return_error;
-		}
-
-		/* validate/normalize using equality matching rule validator! */
-		rc = asserted_value_validate_normalize(
-			vrf->vrf_sub_desc, vrf->vrf_sub_desc->ad_type->sat_equality,
-			usage, &value, &bv, text );
-		if( rc != LDAP_SUCCESS ) {
-			goto return_error;
-		}
-
-		value = bv;
-
-		rc = LDAP_PROTOCOL_ERROR;
-
-		switch ( tag ) {
-		case LDAP_SUBSTRING_INITIAL:
-#ifdef NEW_LOGGING
-			LDAP_LOG( FILTER, DETAIL1, 
-				"get_substring_filter: conn %d  INITIAL\n", 
-				op->o_connid, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_FILTER, "  INITIAL\n", 0, 0, 0 );
-#endif
-
-			if ( vrf->vrf_sub_initial.bv_val != NULL
-				|| vrf->vrf_sub_any != NULL 
-				|| vrf->vrf_sub_final.bv_val != NULL )
-			{
-				free( value.bv_val );
-				goto return_error;
-			}
-
-			vrf->vrf_sub_initial = value;
-			break;
-
-		case LDAP_SUBSTRING_ANY:
-#ifdef NEW_LOGGING
-			LDAP_LOG( FILTER, DETAIL1, 
-				"get_substring_filter: conn %d  ANY\n", op->o_connid, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_FILTER, "  ANY\n", 0, 0, 0 );
-#endif
-
-			if ( vrf->vrf_sub_final.bv_val != NULL ) {
-				free( value.bv_val );
-				goto return_error;
-			}
-
-			ber_bvarray_add( &vrf->vrf_sub_any, &value );
-			break;
-
-		case LDAP_SUBSTRING_FINAL:
-#ifdef NEW_LOGGING
-			LDAP_LOG( FILTER, DETAIL1, 
-				"get_substring_filter: conn %d  FINAL\n", op->o_connid, 0, 0 );
-#else
-			Debug( LDAP_DEBUG_FILTER, "  FINAL\n", 0, 0, 0 );
-#endif
-
-			if ( vrf->vrf_sub_final.bv_val != NULL ) {
-				free( value.bv_val );
-				goto return_error;
-			}
-
-			vrf->vrf_sub_final = value;
-			break;
-
-		default:
-#ifdef NEW_LOGGING
-			LDAP_LOG( FILTER, INFO, 
-				"get_substring_filter: conn %d  unknown substring type %ld\n",
-				op->o_connid, (long)tag, 0 );
-#else
-			Debug( LDAP_DEBUG_FILTER,
-				"  unknown substring type=%ld\n",
-				(long) tag, 0, 0 );
-#endif
-
-			free( value.bv_val );
-
-return_error:
-#ifdef NEW_LOGGING
-			LDAP_LOG( FILTER, INFO, 
-				"get_substring_filter: conn %d  error %ld\n",
-				op->o_connid, (long)rc, 0 );
-#else
-			Debug( LDAP_DEBUG_FILTER, "  error=%ld\n",
-				(long) rc, 0, 0 );
-#endif
-			free( vrf->vrf_sub_initial.bv_val );
-			ber_bvarray_free( vrf->vrf_sub_any );
-			free( vrf->vrf_sub_final.bv_val );
-			ch_free( vrf->vrf_sub );
-			return rc;
-		}
-	}
-
-#ifdef NEW_LOGGING
-	LDAP_LOG( FILTER, ENTRY, 
-		"get_substring_filter: conn %d exit\n", op->o_connid, 0, 0 );
-#else
-	Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
-#endif
-	return( LDAP_SUCCESS );
-}
-#endif /* unused */