servers/slapd/filter.c - diff

Return to filter.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/filter.c between versions 1.99 and 1.124

version 1.99, 2003/03/16 20:58:00	version 1.124, 2004/09/04 02:54:30
Line 1	Line 1
/* filter.c - routines for parsing and dealing with filters */	/* filter.c - routines for parsing and dealing with filters */
/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.98 2003/03/16 20:50:39 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.123 2004/05/19 17:39:40 kurt Exp $ */
/*	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.	*
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* Copyright 1998-2004 The OpenLDAP Foundation.
	* All rights reserved.
	*
	* Redistribution and use in source and binary forms, with or without
	* modification, are permitted only as authorized by the OpenLDAP
	* Public License.
	*
	* A copy of this license is available in the file LICENSE in the
	* top-level directory of the distribution or, alternatively, at
	* <http://www.OpenLDAP.org/license.html>.
	*/
	/* Portions Copyright (c) 1995 Regents of the University of Michigan.
	* All rights reserved.
	*
	* Redistribution and use in source and binary forms are permitted
	* provided that this notice is preserved and that due credit is given
	* to the University of Michigan at Ann Arbor. The name of the University
	* may not be used to endorse or promote products derived from this
	* software without specific prior written permission. This software
	* is provided ``as is'' without express or implied warranty.
*/	*/

#include "portable.h"	#include "portable.h"
Line 15	Line 34
#include "slap.h"	#include "slap.h"

static int get_filter_list(	static int get_filter_list(
Connection *conn,	Operation *op,
BerElement *ber,	BerElement *ber,
Filter **f,	Filter **f,
const char **text );	const char **text );

static int get_substring_filter(	static int get_ssa(
Connection *conn,	Operation *op,
BerElement *ber,	BerElement *ber,
Filter *f,	SubstringsAssertion **s,
const char **text );	const char **text );

	static int filter_escape_value_x(
	struct berval *in,
	struct berval *out,
	void *ctx );

static void simple_vrFilter2bv(	static void simple_vrFilter2bv(
	Operation *op,
ValuesReturnFilter *f,	ValuesReturnFilter *f,
struct berval *fstr );	struct berval *fstr );

static int get_simple_vrFilter(	static int get_simple_vrFilter(
Connection *conn,	Operation *op,
BerElement *ber,	BerElement *ber,
ValuesReturnFilter **f,	ValuesReturnFilter **f,
const char **text );	const char **text );

#ifdef SLAP_NVALUES
#define XXX 1
#endif

int	int
get_filter(	get_filter(
Connection *conn,	Operation *op,
BerElement *ber,	BerElement *ber,
Filter **filt,	Filter **filt,
const char **text )	const char **text )
Line 52 get_filter(	Line 73 get_filter(
int err;	int err;
Filter f;	Filter f;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
#endif
/*	/*
* A filter looks like this coming in:	* A filter looks like this coming in:
* Filter ::= CHOICE {	* Filter ::= CHOICE {
Line 104 get_filter(	Line 121 get_filter(

switch ( f.f_choice ) {	switch ( f.f_choice ) {
case LDAP_FILTER_EQUALITY:	case LDAP_FILTER_EQUALITY:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
"get_filter: conn %d EQUALITY\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &f.f_ava, SLAP_MR_EQUALITY, text );
err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
Line 119 get_filter(	Line 131 get_filter(
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d SUBSTRINGS\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
#endif	err = get_ssa( op, ber, &f.f_sub, text );
err = get_substring_filter( conn, ber, &f, text );
if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
break;	break;
}	}
Line 133 get_filter(	Line 140 get_filter(
break;	break;

case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d GE\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
Line 147 get_filter(	Line 149 get_filter(
break;	break;

case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d LE\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
err = get_ava( ber, &f.f_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
Line 163 get_filter(	Line 160 get_filter(
case LDAP_FILTER_PRESENT: {	case LDAP_FILTER_PRESENT: {
struct berval type;	struct berval type;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d PRESENT\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
#endif
if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {	if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {
err = SLAPD_DISCONNECT;	err = SLAPD_DISCONNECT;
*text = "error decoding filter";	*text = "error decoding filter";
Line 180 get_filter(	Line 172 get_filter(

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	/* unrecognized attribute description or other error */
	Debug( LDAP_DEBUG_ANY,
	"get_filter: conn %d unknown attribute "
	"type=%s (%d)\n",
	op->o_connid, type.bv_val, err );

f.f_choice = SLAPD_FILTER_COMPUTED;	f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = LDAP_COMPARE_FALSE;	f.f_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;	err = LDAP_SUCCESS;
	*text = NULL;
break;	break;
}	}

Line 190 get_filter(	Line 188 get_filter(
} break;	} break;

case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d APPROX\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text );
err = get_ava( ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
Line 204 get_filter(	Line 197 get_filter(
break;	break;

case LDAP_FILTER_AND:	case LDAP_FILTER_AND:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d AND\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
#endif	err = get_filter_list( op, ber, &f.f_and, text );
err = get_filter_list( conn, ber, &f.f_and, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
	if ( f.f_and == NULL ) {
	f.f_choice = SLAPD_FILTER_COMPUTED;
	f.f_result = LDAP_COMPARE_TRUE;
	}
/* no assert - list could be empty */	/* no assert - list could be empty */
break;	break;

case LDAP_FILTER_OR:	case LDAP_FILTER_OR:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d OR\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
#endif	err = get_filter_list( op, ber, &f.f_or, text );
err = get_filter_list( conn, ber, &f.f_or, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
	if ( f.f_or == NULL ) {
	f.f_choice = SLAPD_FILTER_COMPUTED;
	f.f_result = LDAP_COMPARE_FALSE;
	}
/* no assert - list could be empty */	/* no assert - list could be empty */
break;	break;

case LDAP_FILTER_NOT:	case LDAP_FILTER_NOT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d NOT\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
#endif
(void) ber_skip_tag( ber, &len );	(void) ber_skip_tag( ber, &len );
err = get_filter( conn, ber, &f.f_not, text );	err = get_filter( op, ber, &f.f_not, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}

#ifdef XXX
assert( f.f_not != NULL );	assert( f.f_not != NULL );
#endif	if ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {
	int fresult = f.f_not->f_result;
	f.f_choice = SLAPD_FILTER_COMPUTED;
	op->o_tmpfree( f.f_not, op->o_tmpmemctx );
	f.f_not = NULL;

	switch( fresult ) {
	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;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d EXTENSIBLE\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
#endif

err = get_mra( ber, &f.f_mra, text );	err = get_mra( op, ber, &f.f_mra, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}

#ifdef XXX
assert( f.f_mra != NULL );	assert( f.f_mra != NULL );
#endif
break;	break;

default:	default:
(void) ber_scanf( ber, "x" ); /* skip the element */	(void) ber_scanf( ber, "x" ); /* skip the element */
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"get_filter: conn %d unknown filter type=%lu\n",
conn->c_connid, f.f_choice, 0 );
#else
Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",	Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
f.f_choice, 0, 0 );	f.f_choice, 0, 0 );
#endif
f.f_choice = SLAPD_FILTER_COMPUTED;	f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = SLAPD_COMPARE_UNDEFINED;	f.f_result = SLAPD_COMPARE_UNDEFINED;
break;	break;
Line 284 get_filter(	Line 272 get_filter(

if( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {	if( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {
/* ignore error */	/* ignore error */
	*text = NULL;
f.f_choice = SLAPD_FILTER_COMPUTED;	f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = SLAPD_COMPARE_UNDEFINED;	f.f_result = SLAPD_COMPARE_UNDEFINED;
err = LDAP_SUCCESS;	err = LDAP_SUCCESS;
}	}

if ( err == LDAP_SUCCESS ) {	if ( err == LDAP_SUCCESS ) {
*filt = ch_malloc( sizeof(f) );	*filt = op->o_tmpalloc( sizeof(f), op->o_tmpmemctx );
**filt = f;	**filt = f;
}	}

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
"get_filter: conn %d exit\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
#endif

return( err );	return( err );
}	}

static int	static int
get_filter_list( Connection conn, BerElement ber,	get_filter_list( Operation op, BerElement ber,
Filter **f,	Filter **f,
const char **text )	const char **text )
{	{
Line 315 get_filter_list( Connection *conn, BerEl	Line 299 get_filter_list( Connection *conn, BerEl
ber_len_t len;	ber_len_t len;
char *last;	char *last;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_filter_list: conn %d start\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
#endif
new = f;	new = f;
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT;	tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )	tag = ber_next_element( ber, &len, last ) )
{	{
err = get_filter( conn, ber, new, text );	err = get_filter( op, ber, new, text );
if ( err != LDAP_SUCCESS )	if ( err != LDAP_SUCCESS )
return( err );	return( err );
new = &(*new)->f_next;	new = &(*new)->f_next;
}	}
*new = NULL;	*new = NULL;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_filter_list: conn %d exit\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
#endif
return( LDAP_SUCCESS );	return( LDAP_SUCCESS );
}	}

static int	static int
get_substring_filter(	get_ssa(
Connection *conn,	Operation *op,
BerElement *ber,	BerElement *ber,
Filter *f,	SubstringsAssertion **out,
const char **text )	const char **text )
{	{
ber_tag_t tag;	ber_tag_t tag;
Line 357 get_substring_filter(	Line 331 get_substring_filter(
SubstringsAssertion ssa;	SubstringsAssertion ssa;

*text = "error decoding filter";	*text = "error decoding filter";
	*out = NULL;

#ifdef NEW_LOGGING	Debug( LDAP_DEBUG_FILTER, "begin get_ssa\n", 0, 0, 0 );
LDAP_LOG( FILTER, ENTRY,
"get_substring_filter: conn %d begin\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
#endif
if ( ber_scanf( ber, "{m" /}/, &desc ) == LBER_ERROR ) {	if ( ber_scanf( ber, "{m" /}/, &desc ) == LBER_ERROR ) {
return SLAPD_DISCONNECT;	return SLAPD_DISCONNECT;
}	}

*text = NULL;	*text = NULL;
f->f_choice = SLAPD_FILTER_COMPUTED;
f->f_result = SLAPD_COMPARE_UNDEFINED;

ssa.sa_desc = NULL;	ssa.sa_desc = NULL;
ssa.sa_initial.bv_val = NULL;	ssa.sa_initial.bv_val = NULL;
Line 380 get_substring_filter(	Line 348 get_substring_filter(
rc = slap_bv2ad( &desc, &ssa.sa_desc, text );	rc = slap_bv2ad( &desc, &ssa.sa_desc, text );

if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
return LDAP_SUCCESS;	Debug( LDAP_DEBUG_ANY,
	"get_ssa: conn %d unknown attribute type=%s (%d)\n",
	op->o_connid, desc.bv_val, rc );

	/* 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;	rc = LDAP_PROTOCOL_ERROR;
Line 398 get_substring_filter(	Line 376 get_substring_filter(
}	}

if ( value.bv_val == NULL \|\| value.bv_len == 0 ) {	if ( value.bv_val == NULL \|\| value.bv_len == 0 ) {
free( value.bv_val );
rc = LDAP_INVALID_SYNTAX;	rc = LDAP_INVALID_SYNTAX;
goto return_error;	goto return_error;
}	}
Line 419 get_substring_filter(	Line 396 get_substring_filter(
default:	default:
rc = LDAP_PROTOCOL_ERROR;	rc = LDAP_PROTOCOL_ERROR;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"get_filter_substring: conn %d unknown substring choice=%ld\n",
conn->c_connid, (long)tag, 0 );
#else
Debug( LDAP_DEBUG_FILTER,	Debug( LDAP_DEBUG_FILTER,
" unknown substring choice=%ld\n",	" unknown substring choice=%ld\n",
(long) tag, 0, 0 );	(long) tag, 0, 0 );
#endif
free( value.bv_val );
goto return_error;	goto return_error;
}	}

#ifdef SLAP_NVALUES
/* validate/normalize using equality matching rule validator! */	/* validate/normalize using equality matching rule validator! */
rc = asserted_value_validate_normalize(	rc = asserted_value_validate_normalize(
ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,	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 ) {	if( rc != LDAP_SUCCESS ) {
free( value.bv_val );
goto return_error;	goto return_error;
}	}
#else
/* validate using equality matching rule validator! */
rc = value_validate( ssa.sa_desc->ad_type->sat_equality,
&value, text );
if( rc != LDAP_SUCCESS ) {
free( value.bv_val );
goto return_error;
}

rc = value_normalize( ssa.sa_desc, usage,
&value, &nvalue, text );

free( value.bv_val );

if( rc != LDAP_SUCCESS ) {
goto return_error;
}
#endif

rc = LDAP_PROTOCOL_ERROR;	rc = LDAP_PROTOCOL_ERROR;

switch ( tag ) {	switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:	case LDAP_SUBSTRING_INITIAL:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_substring_filter: conn %d INITIAL\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );
#endif

if ( ssa.sa_initial.bv_val != NULL	if ( ssa.sa_initial.bv_val != NULL
\|\| ssa.sa_any != NULL	\|\| ssa.sa_any != NULL
\|\| ssa.sa_final.bv_val != NULL )	\|\| ssa.sa_final.bv_val != NULL )
{	{
free( nvalue.bv_val );	slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;	goto return_error;
}	}

Line 485 get_substring_filter(	Line 430 get_substring_filter(
break;	break;

case LDAP_SUBSTRING_ANY:	case LDAP_SUBSTRING_ANY:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_substring_filter: conn %d ANY\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
#endif

if ( ssa.sa_final.bv_val != NULL ) {	if ( ssa.sa_final.bv_val != NULL ) {
free( nvalue.bv_val );	slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;	goto return_error;
}	}

ber_bvarray_add( &ssa.sa_any, &nvalue );	ber_bvarray_add_x( &ssa.sa_any, &nvalue, op->o_tmpmemctx );
break;	break;

case LDAP_SUBSTRING_FINAL:	case LDAP_SUBSTRING_FINAL:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_substring_filter: conn %d FINAL\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );
#endif

if ( ssa.sa_final.bv_val != NULL ) {	if ( ssa.sa_final.bv_val != NULL ) {
free( nvalue.bv_val );	slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;	goto return_error;
}	}

Line 519 get_substring_filter(	Line 452 get_substring_filter(
break;	break;

default:	default:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, INFO,
"get_substring_filter: conn %d unknown substring type %ld\n",
conn->c_connid, (long)tag, 0 );
#else
Debug( LDAP_DEBUG_FILTER,	Debug( LDAP_DEBUG_FILTER,
" unknown substring type=%ld\n",	" unknown substring type=%ld\n",
(long) tag, 0, 0 );	(long) tag, 0, 0 );
#endif

free( nvalue.bv_val );	assert( 0 );
	slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );

return_error:	return_error:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, INFO,
"get_substring_filter: conn %d error %ld\n",
conn->c_connid, (long)rc, 0 );
#else
Debug( LDAP_DEBUG_FILTER, " error=%ld\n",	Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
(long) rc, 0, 0 );	(long) rc, 0, 0 );
#endif	slap_sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );
free( ssa.sa_initial.bv_val );	ber_bvarray_free_x( ssa.sa_any, op->o_tmpmemctx );
ber_bvarray_free( ssa.sa_any );	slap_sl_free( ssa.sa_final.bv_val, op->o_tmpmemctx );
free( ssa.sa_final.bv_val );
return rc;	return rc;
}	}

Line 550 return_error:	Line 472 return_error:
}	}

if( rc == LDAP_SUCCESS ) {	if( rc == LDAP_SUCCESS ) {
f->f_choice = LDAP_FILTER_SUBSTRINGS;	*out = op->o_tmpalloc( sizeof( ssa ), op->o_tmpmemctx );
f->f_sub = ch_malloc( sizeof( ssa ) );	**out = ssa;
*f->f_sub = ssa;
}	}

#ifdef NEW_LOGGING	Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );
LDAP_LOG( FILTER, ENTRY,
"get_substring_filter: conn %d exit\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
#endif

return LDAP_SUCCESS;	return rc /* LDAP_SUCCESS */ ;
}	}

void	void
filter_free( Filter *f )	filter_free_x( Operation op, Filter f )
{	{
Filter p, next;	Filter p, next;

Line 582 filter_free( Filter *f )	Line 498 filter_free( Filter *f )
case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
ava_free( f->f_ava, 1 );	ava_free( op, f->f_ava, 1 );
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
if ( f->f_sub_initial.bv_val != NULL ) {	if ( f->f_sub_initial.bv_val != NULL ) {
free( f->f_sub_initial.bv_val );	op->o_tmpfree( f->f_sub_initial.bv_val, op->o_tmpmemctx );
}	}
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 ) {	if ( f->f_sub_final.bv_val != NULL ) {
free( f->f_sub_final.bv_val );	op->o_tmpfree( f->f_sub_final.bv_val, op->o_tmpmemctx );
}	}
ch_free( f->f_sub );	op->o_tmpfree( f->f_sub, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_AND:	case LDAP_FILTER_AND:
Line 601 filter_free( Filter *f )	Line 517 filter_free( Filter *f )
case LDAP_FILTER_NOT:	case LDAP_FILTER_NOT:
for ( p = f->f_list; p != NULL; p = next ) {	for ( p = f->f_list; p != NULL; p = next ) {
next = p->f_next;	next = p->f_next;
filter_free( p );	filter_free_x( op, p );
}	}
break;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
mra_free( f->f_mra, 1 );	mra_free( op, f->f_mra, 1 );
break;	break;

case SLAPD_FILTER_COMPUTED:	case SLAPD_FILTER_COMPUTED:
break;	break;

default:	default:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"filter_free: unknown filter type %lu\n", f->f_choice, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",	Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
f->f_choice, 0, 0 );	f->f_choice, 0, 0 );
#endif
break;	break;
}	}

free( f );	op->o_tmpfree( f, op->o_tmpmemctx );
}	}

void	void
filter2bv( Filter f, struct berval fstr )	filter_free( Filter *f )
{	{
int i;	Operation op;
Filter *p;
struct berval tmp;	op.o_tmpmemctx = slap_sl_context( f );
ber_len_t len;	op.o_tmpmfuncs = &slap_sl_mfuncs;
	filter_free_x( &op, f );
	}

	void
	filter2bv_x( Operation op, Filter f, struct berval *fstr )
	{
	int i;
	Filter *p;
	struct berval tmp;
	static struct berval
	ber_bvfalse = BER_BVC( "(?=false)" ),
	ber_bvtrue = BER_BVC( "(?=true)" ),
	ber_bvundefined = BER_BVC( "(?=undefined)" ),
	ber_bverror = BER_BVC( "(?=error)" ),
	ber_bvunknown = BER_BVC( "(?=unknown)" ),
	ber_bvnone = BER_BVC( "(?=none)" );
	ber_len_t len;

if ( f == NULL ) {	if ( f == NULL ) {
ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );	ber_dupbv_x( fstr, &ber_bvnone, op->o_tmpmemctx );
return;	return;
}	}

switch ( f->f_choice ) {	switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY:	case LDAP_FILTER_EQUALITY:
filter_escape_value( &f->f_av_value, &tmp );	filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = f->f_av_desc->ad_cname.bv_len +	fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(=)") - 1 );	tmp.bv_len + ( sizeof("(=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
filter_escape_value( &f->f_av_value, &tmp );	filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = f->f_av_desc->ad_cname.bv_len +	fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(>=)") - 1 );	tmp.bv_len + ( sizeof("(>=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
filter_escape_value( &f->f_av_value, &tmp );	filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = f->f_av_desc->ad_cname.bv_len +	fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(<=)") - 1 );	tmp.bv_len + ( sizeof("(<=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
filter_escape_value( &f->f_av_value, &tmp );	filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = f->f_av_desc->ad_cname.bv_len +	fstr->bv_len = f->f_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(~=)") - 1 );	tmp.bv_len + ( sizeof("(~=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
f->f_av_desc->ad_cname.bv_val,	f->f_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );
ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
fstr->bv_len = f->f_sub_desc->ad_cname.bv_len +	fstr->bv_len = f->f_sub_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );	( sizeof("(=*)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 128 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
f->f_sub_desc->ad_cname.bv_val );	f->f_sub_desc->ad_cname.bv_val );
Line 706 filter2bv( Filter f, struct berval fst	Line 634 filter2bv( Filter f, struct berval fst
if ( f->f_sub_initial.bv_val != NULL ) {	if ( f->f_sub_initial.bv_val != NULL ) {
len = fstr->bv_len;	len = fstr->bv_len;

filter_escape_value( &f->f_sub_initial, &tmp );	filter_escape_value_x( &f->f_sub_initial, &tmp, op->o_tmpmemctx );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
	op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,
/* "(attr=" / "%s)",	/* "(attr=" / "%s)",
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}

if ( f->f_sub_any != NULL ) {	if ( f->f_sub_any != NULL ) {
for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) {	for ( i = 0; f->f_sub_any[i].bv_val != NULL; i++ ) {
len = fstr->bv_len;	len = fstr->bv_len;
filter_escape_value( &f->f_sub_any[i], &tmp );	filter_escape_value_x( &f->f_sub_any[i],
	&tmp, op->o_tmpmemctx );

fstr->bv_len += tmp.bv_len + 1;	fstr->bv_len += tmp.bv_len + 1;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
	op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init][any]" / "%s)",	/* "(attr=[init][any]" / "%s)",
tmp.bv_val );	tmp.bv_val );
ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}
}	}

if ( f->f_sub_final.bv_val != NULL ) {	if ( f->f_sub_final.bv_val != NULL ) {
len = fstr->bv_len;	len = fstr->bv_len;

filter_escape_value( &f->f_sub_final, &tmp );	filter_escape_value_x( &f->f_sub_final, &tmp, op->o_tmpmemctx );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
	op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init][any]" */ "%s)",	/* "(attr=[init][any]" */ "%s)",
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}

break;	break;
Line 753 filter2bv( Filter f, struct berval fst	Line 685 filter2bv( Filter f, struct berval fst
case LDAP_FILTER_PRESENT:	case LDAP_FILTER_PRESENT:
fstr->bv_len = f->f_desc->ad_cname.bv_len +	fstr->bv_len = f->f_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );	( sizeof("(=*)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
f->f_desc->ad_cname.bv_val );	f->f_desc->ad_cname.bv_val );
Line 763 filter2bv( Filter f, struct berval fst	Line 695 filter2bv( Filter f, struct berval fst
case LDAP_FILTER_OR:	case LDAP_FILTER_OR:
case LDAP_FILTER_NOT:	case LDAP_FILTER_NOT:
fstr->bv_len = sizeof("(%)") - 1;	fstr->bv_len = sizeof("(%)") - 1;
fstr->bv_val = ch_malloc( fstr->bv_len + 128 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%c)",
f->f_choice == LDAP_FILTER_AND ? '&' :	f->f_choice == LDAP_FILTER_AND ? '&' :
Line 772 filter2bv( Filter f, struct berval fst	Line 704 filter2bv( Filter f, struct berval fst
for ( p = f->f_list; p != NULL; p = p->f_next ) {	for ( p = f->f_list; p != NULL; p = p->f_next ) {
len = fstr->bv_len;	len = fstr->bv_len;

filter2bv( p, &tmp );	filter2bv_x( op, p, &tmp );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
	op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,	snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,
/"("/ "%s)", tmp.bv_val );	/"("/ "%s)", tmp.bv_val );

ch_free( tmp.bv_val );	op->o_tmpfree( tmp.bv_val, op->o_tmpmemctx );
}	}

break;	break;

case LDAP_FILTER_EXT: {	case LDAP_FILTER_EXT: {
struct berval ad;	struct berval ad;
filter_escape_value( &f->f_mr_value, &tmp );	filter_escape_value_x( &f->f_mr_value, &tmp, op->o_tmpmemctx );

if ( f->f_mr_desc ) {	if ( f->f_mr_desc ) {
ad = f->f_mr_desc->ad_cname;	ad = f->f_mr_desc->ad_cname;
} else {	} else {
ad.bv_len = 0;	ad.bv_len = 0;
ad.bv_val = "";	ad.bv_val = "";
}	}

fstr->bv_len = ad.bv_len +	fstr->bv_len = ad.bv_len +
( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +	( f->f_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +	( f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_len+1 : 0 ) +
tmp.bv_len + ( sizeof("(:=)") - 1 );	tmp.bv_len + ( sizeof("(:=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
ad.bv_val,	ad.bv_val,
f->f_mr_dnattrs ? ":dn" : "",	f->f_mr_dnattrs ? ":dn" : "",
f->f_mr_rule_text.bv_len ? ":" : "",	f->f_mr_rule_text.bv_len ? ":" : "",
f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",	f->f_mr_rule_text.bv_len ? f->f_mr_rule_text.bv_val : "",
tmp.bv_val );	tmp.bv_val );
ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
} break;	} break;

case SLAPD_FILTER_COMPUTED:	case SLAPD_FILTER_COMPUTED:
ber_str2bv(	switch ( f->f_result ) {
f->f_result == LDAP_COMPARE_FALSE ? "(?=false)" :	case LDAP_COMPARE_FALSE:
f->f_result == LDAP_COMPARE_TRUE ? "(?=true)" :	tmp = ber_bvfalse;
f->f_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :	break;
"(?=error)",
f->f_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :	case LDAP_COMPARE_TRUE:
f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :	tmp = ber_bvtrue;
f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :	break;
sizeof("(?=error)")-1,
1, fstr );	case SLAPD_COMPARE_UNDEFINED:
break;	tmp = ber_bvundefined;
	break;

	default:
	tmp = ber_bverror;
	break;
	}

	ber_dupbv_x( fstr, &tmp, op->o_tmpmemctx );
	break;

default:	default:
ber_str2bv( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr );	ber_dupbv_x( fstr, &ber_bvunknown, op->o_tmpmemctx );
break;	break;
}	}
}	}

int	void
filter_escape_value(	filter2bv( Filter f, struct berval fstr )
	{
	Operation op;
	op.o_tmpmemctx = NULL;
	op.o_tmpmfuncs = &ch_mfuncs;

	filter2bv_x( &op, f, fstr );
	}

	static int
	filter_escape_value_x(
struct berval *in,	struct berval *in,
struct berval *out )	struct berval *out,
	void *ctx )
{	{
ber_len_t i;	ber_len_t i;
assert( in );	assert( in );
assert( out );	assert( out );

out->bv_val = (char ) ch_malloc( ( in->bv_len 3 ) + 1 );	i = in->bv_len * 3 + 1;
	out->bv_val = ctx ? slap_sl_malloc( i, ctx ) : ch_malloc( i );
out->bv_len = 0;	out->bv_len = 0;

for( i=0; i < in->bv_len ; i++ ) {	for( i=0; i < in->bv_len ; i++ ) {
Line 856 filter_escape_value(	Line 810 filter_escape_value(
return LDAP_SUCCESS;	return LDAP_SUCCESS;
}	}

	int
	filter_escape_value(
	struct berval *in,
	struct berval *out )
	{
	return filter_escape_value_x( in, out, NULL );
	}

static int	static int
get_simple_vrFilter(	get_simple_vrFilter(
Connection *conn,	Operation *op,
BerElement *ber,	BerElement *ber,
ValuesReturnFilter **filt,	ValuesReturnFilter **filt,
const char **text )	const char **text )
Line 866 get_simple_vrFilter(	Line 828 get_simple_vrFilter(
ber_tag_t tag;	ber_tag_t tag;
ber_len_t len;	ber_len_t len;
int err;	int err;
ValuesReturnFilter *vrf;	ValuesReturnFilter vrf;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_simple_vrFilter: conn %d\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_simple_vrFilter\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "begin get_simple_vrFilter\n", 0, 0, 0 );
#endif

tag = ber_peek_tag( ber, &len );	tag = ber_peek_tag( ber, &len );

Line 882 get_simple_vrFilter(	Line 839 get_simple_vrFilter(
return SLAPD_DISCONNECT;	return SLAPD_DISCONNECT;
}	}

vrf = (ValuesReturnFilter *) ch_malloc( sizeof(ValuesReturnFilter) );	vrf.vrf_next = NULL;
vrf->vrf_next = NULL;

err = LDAP_SUCCESS;	err = LDAP_SUCCESS;
vrf->vrf_choice = tag;	vrf.vrf_choice = tag;

switch ( vrf->vrf_choice ) {	switch ( vrf.vrf_choice ) {
case LDAP_FILTER_EQUALITY:	case LDAP_FILTER_EQUALITY:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
"get_simple_vrFilter: conn %d EQUALITY\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY, text );
err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}

assert( vrf->vrf_ava != NULL );	assert( vrf.vrf_ava != NULL );
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d SUBSTRINGS\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
#endif	err = get_ssa( op, ber, &vrf.vrf_sub, text );
err = get_substring_filter( conn, ber, (Filter *)vrf, text );
break;	break;

case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d GE\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
break;	break;

case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d LE\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
Line 943 get_simple_vrFilter(	Line 879 get_simple_vrFilter(
case LDAP_FILTER_PRESENT: {	case LDAP_FILTER_PRESENT: {
struct berval type;	struct berval type;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d PRESENT\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
#endif
if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {	if ( ber_scanf( ber, "m", &type ) == LBER_ERROR ) {
err = SLAPD_DISCONNECT;	err = SLAPD_DISCONNECT;
*text = "error decoding filter";	*text = "error decoding filter";
break;	break;
}	}

vrf->vrf_desc = NULL;	vrf.vrf_desc = NULL;
err = slap_bv2ad( &type, &vrf->vrf_desc, text );	err = slap_bv2ad( &type, &vrf.vrf_desc, text );

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	/* unrecognized attribute description or other error */
vrf->vrf_choice = SLAPD_FILTER_COMPUTED;	Debug( LDAP_DEBUG_ANY,
vrf->vrf_result = LDAP_COMPARE_FALSE;	"get_simple_vrFilter: conn %d unknown "
	"attribute type=%s (%d)\n",
	op->o_connid, type.bv_val, err );

	vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
	vrf.vrf_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;	err = LDAP_SUCCESS;
break;	break;
}	}
} break;	} break;

case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d APPROX\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
#endif	err = get_ava( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY_APPROX, text );
err = get_ava( ber, &vrf->vrf_ava, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
break;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d EXTENSIBLE\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
#endif

err = get_mra( ber, &vrf->vrf_mra, text );	err = get_mra( op, ber, &vrf.vrf_mra, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}

assert( vrf->vrf_mra != NULL );	assert( vrf.vrf_mra != NULL );
break;	break;

default:	default:
(void) ber_scanf( ber, "x" ); /* skip the element */	(void) ber_scanf( ber, "x" ); /* skip the element */
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"get_simple_vrFilter: conn %d unknown filter type=%lu\n",
conn->c_connid, vrf->vrf_choice, 0 );
#else
Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n",	Debug( LDAP_DEBUG_ANY, "get_simple_vrFilter: unknown filter type=%lu\n",
vrf->vrf_choice, 0, 0 );	vrf.vrf_choice, 0, 0 );
#endif	vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
vrf->vrf_choice = SLAPD_FILTER_COMPUTED;	vrf.vrf_result = SLAPD_COMPARE_UNDEFINED;
vrf->vrf_result = SLAPD_COMPARE_UNDEFINED;
break;	break;
}	}

if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS && err != SLAPD_DISCONNECT ) {
if( err != SLAPD_DISCONNECT ) {	/* ignore error */
/* ignore error */	vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
vrf->vrf_choice = SLAPD_FILTER_COMPUTED;	vrf.vrf_result = SLAPD_COMPARE_UNDEFINED;
vrf->vrf_result = SLAPD_COMPARE_UNDEFINED;	err = LDAP_SUCCESS;
err = LDAP_SUCCESS;	}
*filt = vrf;

} else {
free(vrf);
}

} else {	if ( err == LDAP_SUCCESS ) {
*filt = vrf;	*filt = ch_malloc( sizeof vrf );
	**filt = vrf;
}	}

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
"get_simple_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_simple_vrFilter %d\n", err, 0, 0 );
#endif
return( err );	return err;
}	}

int	int
get_vrFilter( Connection conn, BerElement ber,	get_vrFilter( Operation op, BerElement ber,
ValuesReturnFilter **vrf,	ValuesReturnFilter **vrf,
const char **text )	const char **text )
{	{
Line 1075 get_vrFilter( Connection *conn, BerEleme	Line 987 get_vrFilter( Connection *conn, BerEleme
ber_len_t len;	ber_len_t len;
char *last;	char *last;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_vrFilter: conn %d start\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_vrFilter\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "begin get_vrFilter\n", 0, 0, 0 );
#endif

tag = ber_peek_tag( ber, &len );	tag = ber_peek_tag( ber, &len );

Line 1099 get_vrFilter( Connection *conn, BerEleme	Line 1006 get_vrFilter( Connection *conn, BerEleme
tag != LBER_DEFAULT;	tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )	tag = ber_next_element( ber, &len, last ) )
{	{
int err = get_simple_vrFilter( conn, ber, n, text );	int err = get_simple_vrFilter( op, ber, n, text );
if ( err != LDAP_SUCCESS )
return( err );	if ( err != LDAP_SUCCESS ) return( err );

n = &(*n)->vrf_next;	n = &(*n)->vrf_next;
}	}
*n = NULL;	*n = NULL;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_vrFilter: conn %d exit\n", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_vrFilter\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_vrFilter\n", 0, 0, 0 );
#endif
return( LDAP_SUCCESS );	return( LDAP_SUCCESS );
}	}

void	void
vrFilter_free( ValuesReturnFilter *vrf )	vrFilter_free( Operation op, ValuesReturnFilter vrf )
{	{
ValuesReturnFilter p, next;	ValuesReturnFilter p, next;

Line 1135 vrFilter_free( ValuesReturnFilter *vrf )	Line 1038 vrFilter_free( ValuesReturnFilter *vrf )
case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
ava_free( vrf->vrf_ava, 1 );	ava_free( op, vrf->vrf_ava, 1 );
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
if ( vrf->vrf_sub_initial.bv_val != NULL ) {	if ( vrf->vrf_sub_initial.bv_val != NULL ) {
free( vrf->vrf_sub_initial.bv_val );	op->o_tmpfree( vrf->vrf_sub_initial.bv_val, op->o_tmpmemctx );
}	}
ber_bvarray_free( vrf->vrf_sub_any );	ber_bvarray_free_x( vrf->vrf_sub_any, op->o_tmpmemctx );
if ( vrf->vrf_sub_final.bv_val != NULL ) {	if ( vrf->vrf_sub_final.bv_val != NULL ) {
free( vrf->vrf_sub_final.bv_val );	op->o_tmpfree( vrf->vrf_sub_final.bv_val, op->o_tmpmemctx );
}	}
ch_free( vrf->vrf_sub );	op->o_tmpfree( vrf->vrf_sub, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
mra_free( vrf->vrf_mra, 1 );	mra_free( op, vrf->vrf_mra, 1 );
break;	break;

case SLAPD_FILTER_COMPUTED:	case SLAPD_FILTER_COMPUTED:
break;	break;

default:	default:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ERR,
"filter_free: unknown filter type %lu\n", vrf->vrf_choice, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",	Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
vrf->vrf_choice, 0, 0 );	vrf->vrf_choice, 0, 0 );
#endif
break;	break;
}	}

free( vrf );	op->o_tmpfree( vrf, op->o_tmpmemctx );
}	}
}	}


void	void
vrFilter2bv( ValuesReturnFilter vrf, struct berval fstr )	vrFilter2bv( Operation op, ValuesReturnFilter vrf, struct berval *fstr )
{	{
ValuesReturnFilter *p;	ValuesReturnFilter *p;
struct berval tmp;	struct berval tmp;
ber_len_t len;	ber_len_t len;

if ( vrf == NULL ) {	if ( vrf == NULL ) {
ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );	ber_str2bv_x( "No filter!", sizeof("No filter!")-1,
	1, fstr, op->o_tmpmemctx );
return;	return;
}	}

fstr->bv_len = sizeof("()") - 1;	fstr->bv_len = sizeof("()") - 1;
fstr->bv_val = ch_malloc( fstr->bv_len + 128 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "()");	snprintf( fstr->bv_val, fstr->bv_len + 1, "()");

for ( p = vrf; p != NULL; p = p->vrf_next ) {	for ( p = vrf; p != NULL; p = p->vrf_next ) {
len = fstr->bv_len;	len = fstr->bv_len;

simple_vrFilter2bv( p, &tmp );	simple_vrFilter2bv( op, p, &tmp );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
	op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,	snprintf( &fstr->bv_val[len-1], tmp.bv_len + 2,
/"("/ "%s)", tmp.bv_val );	/"("/ "%s)", tmp.bv_val );

ch_free( tmp.bv_val );	op->o_tmpfree( tmp.bv_val, op->o_tmpmemctx );
}	}
}	}

static void	static void
simple_vrFilter2bv( ValuesReturnFilter vrf, struct berval fstr )	simple_vrFilter2bv( Operation op, ValuesReturnFilter vrf, struct berval *fstr )
{	{
struct berval tmp;	struct berval tmp;
ber_len_t len;	ber_len_t len;

if ( vrf == NULL ) {	if ( vrf == NULL ) {
ber_str2bv( "No filter!", sizeof("No filter!")-1, 1, fstr );	ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr,
	op->o_tmpmemctx );
return;	return;
}	}

switch ( vrf->vrf_choice ) {	switch ( vrf->vrf_choice ) {
case LDAP_FILTER_EQUALITY:	case LDAP_FILTER_EQUALITY:
filter_escape_value( &vrf->vrf_av_value, &tmp );	filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +	fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(=)") - 1 );	tmp.bv_len + ( sizeof("(=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,	vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
filter_escape_value( &vrf->vrf_av_value, &tmp );	filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +	fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(>=)") - 1 );	tmp.bv_len + ( sizeof("(>=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s>=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,	vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
filter_escape_value( &vrf->vrf_av_value, &tmp );	filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +	fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(<=)") - 1 );	tmp.bv_len + ( sizeof("(<=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s<=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,	vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
filter_escape_value( &vrf->vrf_av_value, &tmp );	filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );

fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +	fstr->bv_len = vrf->vrf_av_desc->ad_cname.bv_len +
tmp.bv_len + ( sizeof("(~=)") - 1 );	tmp.bv_len + ( sizeof("(~=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s~=%s)",
vrf->vrf_av_desc->ad_cname.bv_val,	vrf->vrf_av_desc->ad_cname.bv_val,
tmp.bv_val );	tmp.bv_val );
ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
fstr->bv_len = vrf->vrf_sub_desc->ad_cname.bv_len +	fstr->bv_len = vrf->vrf_sub_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );	( sizeof("(=*)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 128 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
vrf->vrf_sub_desc->ad_cname.bv_val );	vrf->vrf_sub_desc->ad_cname.bv_val );
Line 1282 simple_vrFilter2bv( ValuesReturnFilter *	Line 1182 simple_vrFilter2bv( ValuesReturnFilter *
if ( vrf->vrf_sub_initial.bv_val != NULL ) {	if ( vrf->vrf_sub_initial.bv_val != NULL ) {
len = fstr->bv_len;	len = fstr->bv_len;

filter_escape_value( &vrf->vrf_sub_initial, &tmp );	filter_escape_value_x( &vrf->vrf_sub_initial, &tmp, op->o_tmpmemctx );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
	op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-2], tmp.bv_len+3,
/* "(attr=" / "%s)",	/* "(attr=" / "%s)",
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}

if ( vrf->vrf_sub_any != NULL ) {	if ( vrf->vrf_sub_any != NULL ) {
int i;	int i;
for ( i = 0; vrf->vrf_sub_any[i].bv_val != NULL; i++ ) {	for ( i = 0; vrf->vrf_sub_any[i].bv_val != NULL; i++ ) {
len = fstr->bv_len;	len = fstr->bv_len;
filter_escape_value( &vrf->vrf_sub_any[i], &tmp );	filter_escape_value_x( &vrf->vrf_sub_any[i], &tmp,
	op->o_tmpmemctx );

fstr->bv_len += tmp.bv_len + 1;	fstr->bv_len += tmp.bv_len + 1;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val,
	fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init][any]" / "%s)",	/* "(attr=[init][any]" / "%s)",
tmp.bv_val );	tmp.bv_val );
ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}
}	}

if ( vrf->vrf_sub_final.bv_val != NULL ) {	if ( vrf->vrf_sub_final.bv_val != NULL ) {
len = fstr->bv_len;	len = fstr->bv_len;

filter_escape_value( &vrf->vrf_sub_final, &tmp );	filter_escape_value_x( &vrf->vrf_sub_final, &tmp, op->o_tmpmemctx );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = ch_realloc( fstr->bv_val, fstr->bv_len + 1 );	fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1,
	op->o_tmpmemctx );

snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,	snprintf( &fstr->bv_val[len-1], tmp.bv_len+3,
/* "(attr=[init][any]" */ "%s)",	/* "(attr=[init][any]" */ "%s)",
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}

break;	break;
Line 1330 simple_vrFilter2bv( ValuesReturnFilter *	Line 1234 simple_vrFilter2bv( ValuesReturnFilter *
case LDAP_FILTER_PRESENT:	case LDAP_FILTER_PRESENT:
fstr->bv_len = vrf->vrf_desc->ad_cname.bv_len +	fstr->bv_len = vrf->vrf_desc->ad_cname.bv_len +
( sizeof("(=*)") - 1 );	( sizeof("(=*)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s=*)",
vrf->vrf_desc->ad_cname.bv_val );	vrf->vrf_desc->ad_cname.bv_val );
Line 1338 simple_vrFilter2bv( ValuesReturnFilter *	Line 1242 simple_vrFilter2bv( ValuesReturnFilter *

case LDAP_FILTER_EXT: {	case LDAP_FILTER_EXT: {
struct berval ad;	struct berval ad;
filter_escape_value( &vrf->vrf_mr_value, &tmp );	filter_escape_value_x( &vrf->vrf_mr_value, &tmp, op->o_tmpmemctx );

if ( vrf->vrf_mr_desc ) {	if ( vrf->vrf_mr_desc ) {
ad = vrf->vrf_mr_desc->ad_cname;	ad = vrf->vrf_mr_desc->ad_cname;
Line 1349 simple_vrFilter2bv( ValuesReturnFilter *	Line 1253 simple_vrFilter2bv( ValuesReturnFilter *

fstr->bv_len = ad.bv_len +	fstr->bv_len = ad.bv_len +
( vrf->vrf_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +	( vrf->vrf_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +
( vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) +	( vrf->vrf_mr_rule_text.bv_len
	? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) +
tmp.bv_len + ( sizeof("(:=)") - 1 );	tmp.bv_len + ( sizeof("(:=)") - 1 );
fstr->bv_val = ch_malloc( fstr->bv_len + 1 );	fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );

snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",	snprintf( fstr->bv_val, fstr->bv_len + 1, "(%s%s%s%s:=%s)",
ad.bv_val,	ad.bv_val,
Line 1360 simple_vrFilter2bv( ValuesReturnFilter *	Line 1265 simple_vrFilter2bv( ValuesReturnFilter *
vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_val : "",	vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_val : "",
tmp.bv_val );	tmp.bv_val );

ber_memfree( tmp.bv_val );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
} break;	} break;

case SLAPD_FILTER_COMPUTED:	case SLAPD_FILTER_COMPUTED:
ber_str2bv(	ber_str2bv_x(
vrf->vrf_result == LDAP_COMPARE_FALSE ? "(?=false)" :	vrf->vrf_result == LDAP_COMPARE_FALSE ? "(?=false)" :
vrf->vrf_result == LDAP_COMPARE_TRUE ? "(?=true)" :	vrf->vrf_result == LDAP_COMPARE_TRUE ? "(?=true)" :
vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :	vrf->vrf_result == SLAPD_COMPARE_UNDEFINED
"(?=error)",	? "(?=undefined)" : "(?=error)",
vrf->vrf_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :	vrf->vrf_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :
vrf->vrf_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :	vrf->vrf_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :	vrf->vrf_result == SLAPD_COMPARE_UNDEFINED
sizeof("(?=error)")-1,	? sizeof("(?=undefined)")-1 : sizeof("(?=error)")-1,
1, fstr );	1, fstr, op->o_tmpmemctx );
break;	break;

default:	default:
ber_str2bv( "(?=unknown)", sizeof("(?=unknown)")-1, 1, fstr );	ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
	1, fstr, op->o_tmpmemctx );
break;	break;
}	}
}	}

static int
get_substring_vrFilter(
Connection *conn,
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", conn->c_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",
conn->c_connid, (long)tag, 0 );
#else
Debug( LDAP_DEBUG_FILTER,
" unknown substring choice=%ld\n",
(long) tag, 0, 0 );
#endif
goto return_error;
}

#ifdef SLAP_NVALUES
/* 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;
}
#else
/* valiate using equality matching rule validator! */
rc = value_validate( vrf->vrf_sub_desc->ad_type->sat_equality,
&value, text );
if( rc != LDAP_SUCCESS ) {
goto return_error;
}

rc = value_normalize( vrf->vrf_sub_desc, usage,
&value, &bv, text );
if( rc != LDAP_SUCCESS ) {
goto return_error;
}
#endif

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",
conn->c_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", conn->c_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", conn->c_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",
conn->c_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",
conn->c_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", conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
#endif
return( LDAP_SUCCESS );
}

Removed from v.1.99
changed lines
	Added in v.1.124