--- servers/slapd/filter.c	2009/01/22 00:01:01	1.134.2.16
+++ servers/slapd/filter.c	2007/10/05 06:24:36	1.143
@@ -1,8 +1,8 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.134.2.15 2008/11/11 19:30:37 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.142 2007/09/15 15:38:53 ando Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -385,19 +385,6 @@ get_ssa(
 
 	rc = LDAP_PROTOCOL_ERROR;
 
-	if ( ssa.sa_desc->ad_type->sat_substr == NULL ) {
-		for ( tag = ber_first_element( ber, &len, &last );
-			tag != LBER_DEFAULT;
-			tag = ber_next_element( ber, &len, last ) )
-		{
-			/* eat all */
-			rc = ber_scanf( ber, "x" );
-		}
-
-		rc = LDAP_INVALID_SYNTAX;
-		goto return_error;
-	}
-
 	for ( tag = ber_first_element( ber, &len, &last );
 		tag != LBER_DEFAULT;
 		tag = ber_next_element( ber, &len, last ) )
@@ -491,7 +478,6 @@ return_error:
 			return rc;
 		}
 
-		*text = NULL;
 		rc = LDAP_SUCCESS;
 	}
 
@@ -505,7 +491,7 @@ return_error:
 }
 
 void
-filter_free_x( Operation *op, Filter *f, int freeme )
+filter_free_x( Operation *op, Filter *f )
 {
 	Filter	*p, *next;
 
@@ -544,7 +530,7 @@ filter_free_x( Operation *op, Filter *f,
 	case LDAP_FILTER_NOT:
 		for ( p = f->f_list; p != NULL; p = next ) {
 			next = p->f_next;
-			filter_free_x( op, p, 1 );
+			filter_free_x( op, p );
 		}
 		break;
 
@@ -561,9 +547,7 @@ filter_free_x( Operation *op, Filter *f,
 		break;
 	}
 
-	if ( freeme ) {
-		op->o_tmpfree( f, op->o_tmpmemctx );
-	}
+	op->o_tmpfree( f, op->o_tmpmemctx );
 }
 
 void
@@ -575,7 +559,7 @@ filter_free( Filter *f )
 	op.o_hdr = &ohdr;
 	op.o_tmpmemctx = slap_sl_context( f );
 	op.o_tmpmfuncs = &slap_sl_mfuncs;
-	filter_free_x( &op, f, 1 );
+	filter_free_x( &op, f );
 }
 
 void
@@ -583,7 +567,8 @@ filter2bv_x( Operation *op, Filter *f, s
 {
 	int		i;
 	Filter		*p;
-	struct berval	tmp, value;
+	struct berval	tmp;
+	char		uuid[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
 	static struct berval
 			ber_bvfalse = BER_BVC( "(?=false)" ),
 			ber_bvtrue = BER_BVC( "(?=true)" ),
@@ -608,6 +593,13 @@ filter2bv_x( Operation *op, Filter *f, s
 	case LDAP_FILTER_EQUALITY:
 		fstr->bv_len = STRLENOF("(=)");
 		sign = "=";
+		if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
+			tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,
+				f->f_av_value.bv_len, uuid, LDAP_LUTIL_UUIDSTR_BUFSIZE );
+			assert( tmp.bv_len > 0 );
+			tmp.bv_val = uuid;
+			goto escaped;
+		}
 		goto simple;
 	case LDAP_FILTER_GE:
 		fstr->bv_len = STRLENOF("(>=)");
@@ -622,22 +614,13 @@ filter2bv_x( Operation *op, Filter *f, s
 		sign = "~=";
 
 simple:
-		value = f->f_av_value;
-		if ( f->f_av_desc->ad_type->sat_equality &&
-			!undef &&
-			( f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ))
-		{
-			f->f_av_desc->ad_type->sat_equality->smr_normalize(
-				(SLAP_MR_DENORMALIZE|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
-				NULL, NULL, &f->f_av_value, &value, op->o_tmpmemctx );
-		}
-
-		filter_escape_value_x( &value, &tmp, op->o_tmpmemctx );
+		filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );
 		/* NOTE: tmp can legitimately be NULL (meaning empty) 
 		 * since in a Filter values in AVAs are supposed
 		 * to have been normalized, meaning that an empty value
 		 * is legal for that attribute's syntax */
 
+escaped:
 		fstr->bv_len += f->f_av_desc->ad_cname.bv_len + tmp.bv_len;
 		if ( undef )
 			fstr->bv_len++;
@@ -648,10 +631,6 @@ simple:
 			f->f_av_desc->ad_cname.bv_val, sign,
 			tmp.bv_len ? tmp.bv_val : "" );
 
-		if ( value.bv_val != f->f_av_value.bv_val ) {
-			ber_memfree_x( value.bv_val, op->o_tmpmemctx );
-		}
-
 		ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
 		break;