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.115.2.2 and 1.134.2.1

version 1.115.2.2, 2003/12/01 00:58:34	version 1.134.2.1, 2006/10/19 20:06:45
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.115.2.1 2003/10/06 14:57:29 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.135 2006/09/09 14:23:02 ando Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2003 The OpenLDAP Foundation.	* Copyright 1998-2006 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 45 static int get_ssa(	Line 45 static int get_ssa(
SubstringsAssertion **s,	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,	Operation *op,
ValuesReturnFilter *f,	ValuesReturnFilter *f,
Line 73 get_filter(	Line 68 get_filter(
int err;	int err;
Filter f;	Filter f;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY, "get_filter: conn %d\n", op->o_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 125 get_filter(	Line 116 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", op->o_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( op, ber, &f.f_ava, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 140 get_filter(	Line 126 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", op->o_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_ssa( op, ber, &f.f_sub, text );
if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
break;	break;
Line 154 get_filter(	Line 135 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", op->o_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( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 168 get_filter(	Line 144 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", op->o_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( op, ber, &f.f_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 184 get_filter(	Line 155 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", op->o_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 200 get_filter(	Line 166 get_filter(
err = slap_bv2ad( &type, &f.f_desc, text );	err = slap_bv2ad( &type, &f.f_desc, text );

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	err = slap_bv2undef_ad( &type, &f.f_desc, text,
f.f_choice = SLAPD_FILTER_COMPUTED;	SLAP_AD_PROXIED\|SLAP_AD_NOINSERT );
f.f_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;	if ( err != LDAP_SUCCESS ) {
*text = NULL;	/* unrecognized attribute description or other error */
break;	Debug( LDAP_DEBUG_ANY,
	"get_filter: conn %lu unknown attribute "
	"type=%s (%d)\n",
	op->o_connid, type.bv_val, err );

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

assert( f.f_desc != NULL );	assert( f.f_desc != NULL );
} break;	} break;

case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d APPROX\n", op->o_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( op, ber, &f.f_ava, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 226 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", op->o_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( op, ber, &f.f_and, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 244 get_filter(	Line 210 get_filter(
break;	break;

case LDAP_FILTER_OR:	case LDAP_FILTER_OR:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d OR\n", op->o_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( op, ber, &f.f_or, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 262 get_filter(	Line 223 get_filter(
break;	break;

case LDAP_FILTER_NOT:	case LDAP_FILTER_NOT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d NOT\n", op->o_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( op, ber, &f.f_not, text );	err = get_filter( op, ber, &f.f_not, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
Line 295 get_filter(	Line 251 get_filter(
break;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_filter: conn %d EXTENSIBLE\n", op->o_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( op, ber, &f.f_mra, text );	err = get_mra( op, ber, &f.f_mra, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
Line 312 get_filter(	Line 263 get_filter(

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",
op->o_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 338 get_filter(	Line 283 get_filter(
**filt = f;	**filt = f;
}	}

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
"get_filter: conn %d exit\n", op->o_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 );
}	}
Line 359 get_filter_list( Operation *op, BerEleme	Line 299 get_filter_list( Operation *op, BerEleme
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", op->o_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;
Line 377 get_filter_list( Operation *op, BerEleme	Line 312 get_filter_list( Operation *op, BerEleme
}	}
*new = NULL;	*new = NULL;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_filter_list: conn %d exit\n", op->o_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 );
}	}

Line 401 get_ssa(	Line 331 get_ssa(
SubstringsAssertion ssa;	SubstringsAssertion ssa;

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

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_ssa: conn %d begin\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "begin get_ssa\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "begin get_ssa\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;
}	}
Line 422 get_ssa(	Line 348 get_ssa(
rc = slap_bv2ad( &desc, &ssa.sa_desc, text );	rc = slap_bv2ad( &desc, &ssa.sa_desc, text );

if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
/* skip over the rest of this filter */	rc = slap_bv2undef_ad( &desc, &ssa.sa_desc, text,
for ( tag = ber_first_element( ber, &len, &last );	SLAP_AD_PROXIED\|SLAP_AD_NOINSERT );
tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) ) {	if( rc != LDAP_SUCCESS ) {
ber_scanf( ber, "x" );	Debug( LDAP_DEBUG_ANY,
	"get_ssa: conn %lu unknown attribute type=%s (%ld)\n",
	op->o_connid, desc.bv_val, (long) 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;
}	}
return rc;
}	}

rc = LDAP_PROTOCOL_ERROR;	rc = LDAP_PROTOCOL_ERROR;
Line 452 get_ssa(	Line 387 get_ssa(

switch ( tag ) {	switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:	case LDAP_SUBSTRING_INITIAL:
	if ( ssa.sa_initial.bv_val != NULL
	\|\| ssa.sa_any != NULL
	\|\| ssa.sa_final.bv_val != NULL )
	{
	rc = LDAP_PROTOCOL_ERROR;
	goto return_error;
	}
usage = SLAP_MR_SUBSTR_INITIAL;	usage = SLAP_MR_SUBSTR_INITIAL;
break;	break;

case LDAP_SUBSTRING_ANY:	case LDAP_SUBSTRING_ANY:
	if ( ssa.sa_final.bv_val != NULL ) {
	rc = LDAP_PROTOCOL_ERROR;
	goto return_error;
	}
usage = SLAP_MR_SUBSTR_ANY;	usage = SLAP_MR_SUBSTR_ANY;
break;	break;

case LDAP_SUBSTRING_FINAL:	case LDAP_SUBSTRING_FINAL:
	if ( ssa.sa_final.bv_val != NULL ) {
	rc = LDAP_PROTOCOL_ERROR;
	goto return_error;
	}

usage = SLAP_MR_SUBSTR_FINAL;	usage = SLAP_MR_SUBSTR_FINAL;
break;	break;

default:	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,	Debug( LDAP_DEBUG_FILTER,
" unknown substring choice=%ld\n",	" unknown substring choice=%ld\n",
(long) tag, 0, 0 );	(long) tag, 0, 0 );
#endif

	rc = LDAP_PROTOCOL_ERROR;
goto return_error;	goto return_error;
}	}

Line 483 get_ssa(	Line 427 get_ssa(
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, op->o_tmpmemctx );	usage, &value, &nvalue, text, op->o_tmpmemctx );
	if( rc != LDAP_SUCCESS ) goto return_error;
if( rc != LDAP_SUCCESS ) {
goto return_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_ssa: conn %d INITIAL\n",
op->o_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
\|\| ssa.sa_any != NULL
\|\| ssa.sa_final.bv_val != NULL )
{
sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}

ssa.sa_initial = nvalue;	ssa.sa_initial = nvalue;
break;	break;

case LDAP_SUBSTRING_ANY:	case LDAP_SUBSTRING_ANY:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_ssa: conn %d ANY\n",
op->o_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 ) {
sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}

ber_bvarray_add_x( &ssa.sa_any, &nvalue, op->o_tmpmemctx );	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_ssa: conn %d FINAL\n",
op->o_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 ) {
sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;
}

ssa.sa_final = nvalue;	ssa.sa_final = nvalue;
break;	break;

default:	default:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, INFO,
"get_ssa: 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

assert( 0 );	assert( 0 );
sl_free( nvalue.bv_val, op->o_tmpmemctx );	slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
	rc = LDAP_PROTOCOL_ERROR;

return_error:	return_error:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, INFO,
"get_ssa: conn %d error %ld\n",
op->o_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 );
sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );
ber_bvarray_free_x( ssa.sa_any, op->o_tmpmemctx );	ber_bvarray_free_x( ssa.sa_any, op->o_tmpmemctx );
sl_free( ssa.sa_final.bv_val, op->o_tmpmemctx );	slap_sl_free( ssa.sa_final.bv_val, op->o_tmpmemctx );
return rc;	return rc;
}	}

Line 582 return_error:	Line 467 return_error:
**out = ssa;	**out = ssa;
}	}

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_ssa: conn %d exit\n", op->o_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );
#endif	return rc /* LDAP_SUCCESS */ ;

return LDAP_SUCCESS;
}	}

void	void
Line 640 filter_free_x( Operation op, Filter f	Line 519 filter_free_x( Operation op, Filter f
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;
}	}

Line 657 void	Line 531 void
filter_free( Filter *f )	filter_free( Filter *f )
{	{
Operation op;	Operation op;
	Opheader ohdr;

op.o_tmpmemctx = sl_context( f );	op.o_hdr = &ohdr;
op.o_tmpmfuncs = &sl_mfuncs;	op.o_tmpmemctx = slap_sl_context( f );
	op.o_tmpmfuncs = &slap_sl_mfuncs;
filter_free_x( &op, f );	filter_free_x( &op, f );
}	}

void	void
filter2bv_x( Operation op, Filter f, struct berval *fstr )	filter2bv_x( Operation op, Filter f, struct berval *fstr )
{	{
int i;	int i;
Filter *p;	Filter *p;
struct berval tmp;	struct berval tmp;
ber_len_t len;	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_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );	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_x( &f->f_av_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 */

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 + STRLENOF("(=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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_len ? tmp.bv_val : "" );

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

case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
filter_escape_value_x( &f->f_av_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 */

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 + STRLENOF("(>=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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_len ? tmp.bv_val : "");

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

case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
filter_escape_value_x( &f->f_av_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 */

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 + STRLENOF("(<=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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_len ? tmp.bv_val : "");

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

case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
filter_escape_value_x( &f->f_av_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 */

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 + STRLENOF("(~=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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_len ? tmp.bv_val : "");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	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 );	STRLENOF("(=*)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );	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 );

if ( f->f_sub_initial.bv_val != NULL ) {	if ( f->f_sub_initial.bv_val != NULL ) {
	ber_len_t tmplen;

len = fstr->bv_len;	len = fstr->bv_len;

filter_escape_value_x( &f->f_sub_initial, &tmp, op->o_tmpmemctx );	filter_escape_value_x( &f->f_sub_initial, &tmp, op->o_tmpmemctx );
	tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmplen;
fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	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],
	tmplen + STRLENOF( /(/ "*)" ) + 1,
/* "(attr=" / "%s)",	/* "(attr=" / "%s)",
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");

ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	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;	ber_len_t tmplen;
filter_escape_value_x( &f->f_sub_any[i], &tmp, op->o_tmpmemctx );

fstr->bv_len += tmp.bv_len + 1;	len = fstr->bv_len;
fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	filter_escape_value_x( &f->f_sub_any[i],
	&tmp, op->o_tmpmemctx );
	tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );

	fstr->bv_len += tmplen + STRLENOF( /(/ ")" );
	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],
	tmplen + STRLENOF( /(/ "*)" ) + 1,
/* "(attr=[init][any]" / "%s)",	/* "(attr=[init][any]" / "%s)",
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	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 ) {
	ber_len_t tmplen;

len = fstr->bv_len;	len = fstr->bv_len;

filter_escape_value_x( &f->f_sub_final, &tmp, op->o_tmpmemctx );	filter_escape_value_x( &f->f_sub_final, &tmp, op->o_tmpmemctx );
	tmplen = tmp.bv_len ? tmp.bv_len : STRLENOF( "(null)" );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmplen;
fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	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],
	tmplen + STRLENOF( /(/ ")" ) + 1,
/* "(attr=[init][any]" */ "%s)",	/* "(attr=[init][any]" */ "%s)",
tmp.bv_val );	tmp.bv_len ? tmp.bv_val : "(null)");

ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
}	}
Line 789 filter2bv_x( Operation op, Filter f, s	Line 704 filter2bv_x( Operation op, Filter f, s

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 );	STRLENOF("(=*)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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=*)",
Line 799 filter2bv_x( Operation op, Filter f, s	Line 714 filter2bv_x( Operation op, Filter f, s
case LDAP_FILTER_AND:	case LDAP_FILTER_AND:
case LDAP_FILTER_OR:	case LDAP_FILTER_OR:
case LDAP_FILTER_NOT:	case LDAP_FILTER_NOT:
fstr->bv_len = sizeof("(%)") - 1;	fstr->bv_len = STRLENOF("(%)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );	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)",
Line 812 filter2bv_x( Operation op, Filter f, s	Line 727 filter2bv_x( Operation op, Filter f, s
filter2bv_x( op, p, &tmp );	filter2bv_x( op, p, &tmp );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	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 + STRLENOF( /(/ ")" ) + 1,
/"("/ "%s)", tmp.bv_val );	/"("/ "%s)", tmp.bv_val );

op->o_tmpfree( tmp.bv_val, op->o_tmpmemctx );	op->o_tmpfree( tmp.bv_val, op->o_tmpmemctx );
Line 824 filter2bv_x( Operation op, Filter f, s	Line 741 filter2bv_x( Operation op, Filter f, s

case LDAP_FILTER_EXT: {	case LDAP_FILTER_EXT: {
struct berval ad;	struct berval ad;

filter_escape_value_x( &f->f_mr_value, &tmp, op->o_tmpmemctx );	filter_escape_value_x( &f->f_mr_value, &tmp, op->o_tmpmemctx );
	/* NOTE: tmp can legitimately be NULL (meaning empty)
	* since in a Filter values in MRAs are supposed
	* to have been normalized, meaning that an empty value
	* is legal for that attribute's syntax */

if ( f->f_mr_desc ) {	if ( f->f_mr_desc ) {
ad = f->f_mr_desc->ad_cname;	ad = f->f_mr_desc->ad_cname;
Line 832 filter2bv_x( Operation op, Filter f, s	Line 754 filter2bv_x( Operation op, Filter f, s
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 ? STRLENOF(":dn") : 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 + STRLENOF("(:=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 844 filter2bv_x( Operation op, Filter f, s	Line 766 filter2bv_x( Operation op, Filter f, s
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_len ? tmp.bv_val : "" );
ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );	ber_memfree_x( tmp.bv_val, op->o_tmpmemctx );
} break;	} break;

case SLAPD_FILTER_COMPUTED:	case SLAPD_FILTER_COMPUTED:
ber_str2bv_x(	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, op->o_tmpmemctx );	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_x( "(?=unknown)", sizeof("(?=unknown)")-1,	ber_dupbv_x( fstr, &ber_bvunknown, op->o_tmpmemctx );
1, fstr, op->o_tmpmemctx );
break;	break;
}	}
}	}
Line 872 void	Line 802 void
filter2bv( Filter f, struct berval fstr )	filter2bv( Filter f, struct berval fstr )
{	{
Operation op;	Operation op;
	Opheader ohdr;

	op.o_hdr = &ohdr;
op.o_tmpmemctx = NULL;	op.o_tmpmemctx = NULL;
op.o_tmpmfuncs = &ch_mfuncs;	op.o_tmpmfuncs = &ch_mfuncs;

filter2bv_x( &op, f, fstr );	filter2bv_x( &op, f, fstr );
}	}

static int	Filter *
filter_escape_value_x(	filter_dup( Filter f, void memctx )
struct berval *in,
struct berval *out,
void *ctx )
{	{
ber_len_t i;	BerMemoryFunctions *mf = &slap_sl_mfuncs;
assert( in );	Filter *n;
assert( out );

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

for( i=0; i < in->bv_len ; i++ ) {
if( FILTER_ESCAPE(in->bv_val[i]) ) {
out->bv_val[out->bv_len++] = SLAP_ESCAPE_CHAR;
out->bv_val[out->bv_len++] = SLAP_ESCAPE_HI( in->bv_val[i] );
out->bv_val[out->bv_len++] = SLAP_ESCAPE_LO( in->bv_val[i] );
} else {
out->bv_val[out->bv_len++] = in->bv_val[i];
}
}

out->bv_val[out->bv_len] = '\0';	if ( !f )
return LDAP_SUCCESS;	return NULL;
}

int	n = mf->bmf_malloc( sizeof(Filter), memctx );
filter_escape_value(	n->f_choice = f->f_choice;
struct berval *in,	n->f_next = NULL;
struct berval *out )
{	switch( f->f_choice ) {
return filter_escape_value_x( in, out, NULL );	case SLAPD_FILTER_COMPUTED:
	n->f_result = f->f_result;
	break;
	case LDAP_FILTER_PRESENT:
	n->f_desc = f->f_desc;
	break;
	case LDAP_FILTER_EQUALITY:
	case LDAP_FILTER_GE:
	case LDAP_FILTER_LE:
	case LDAP_FILTER_APPROX:
	/* Should this be ava_dup() ? */
	n->f_ava = mf->bmf_calloc( 1, sizeof(AttributeAssertion), memctx );
	n->f_ava = f->f_ava;
	ber_dupbv_x( &n->f_av_value, &f->f_av_value, memctx );
	break;
	case LDAP_FILTER_SUBSTRINGS:
	n->f_sub = mf->bmf_calloc( 1, sizeof(SubstringsAssertion), memctx );
	n->f_sub_desc = f->f_sub_desc;
	if ( !BER_BVISNULL( &f->f_sub_initial ))
	ber_dupbv_x( &n->f_sub_initial, &f->f_sub_initial, memctx );
	if ( f->f_sub_any ) {
	int i;
	for ( i = 0; !BER_BVISNULL( &f->f_sub_any[i] ); i++ );
	n->f_sub_any = mf->bmf_malloc(( i+1 )*sizeof( struct berval ),
	memctx );
	for ( i = 0; !BER_BVISNULL( &f->f_sub_any[i] ); i++ ) {
	ber_dupbv_x( &n->f_sub_any[i], &f->f_sub_any[i], memctx );
	}
	BER_BVZERO( &n->f_sub_any[i] );
	}
	if ( !BER_BVISNULL( &f->f_sub_final ))
	ber_dupbv_x( &n->f_sub_final, &f->f_sub_final, memctx );
	break;
	case LDAP_FILTER_EXT: {
	/* Should this be mra_dup() ? */
	ber_len_t length;
	length = sizeof(MatchingRuleAssertion);
	if ( !BER_BVISNULL( &f->f_mr_rule_text ))
	length += f->f_mr_rule_text.bv_len + 1;
	n->f_mra = mf->bmf_calloc( 1, length, memctx );
	n->f_mra = f->f_mra;
	ber_dupbv_x( &n->f_mr_value, &f->f_mr_value, memctx );
	if ( !BER_BVISNULL( &f->f_mr_rule_text )) {
	n->f_mr_rule_text.bv_val = (char *)(n->f_mra+1);
	AC_MEMCPY(n->f_mr_rule_text.bv_val,
	f->f_mr_rule_text.bv_val, f->f_mr_rule_text.bv_len );
	}
	} break;
	case LDAP_FILTER_AND:
	case LDAP_FILTER_OR:
	case LDAP_FILTER_NOT: {
	Filter **p;
	for ( p = &n->f_list, f = f->f_list; f; f = f->f_next ) {
	*p = filter_dup( f, memctx );
	p = &(*p)->f_next;
	}
	} break;
	}
	return n;
}	}

static int	static int
Line 926 get_simple_vrFilter(	Line 898 get_simple_vrFilter(
int err;	int err;
ValuesReturnFilter vrf;	ValuesReturnFilter vrf;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_simple_vrFilter: conn %d\n", op->o_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 947 get_simple_vrFilter(	Line 914 get_simple_vrFilter(

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", op->o_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( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 962 get_simple_vrFilter(	Line 924 get_simple_vrFilter(
break;	break;

case LDAP_FILTER_SUBSTRINGS:	case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d SUBSTRINGS\n", op->o_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_ssa( op, ber, &vrf.vrf_sub, 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", op->o_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( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 985 get_simple_vrFilter(	Line 937 get_simple_vrFilter(
break;	break;

case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d LE\n", op->o_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( op, ber, &vrf.vrf_ava, SLAP_MR_ORDERING, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 1000 get_simple_vrFilter(	Line 947 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", op->o_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 1016 get_simple_vrFilter(	Line 958 get_simple_vrFilter(
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 */	err = slap_bv2undef_ad( &type, &vrf.vrf_desc, text,
vrf.vrf_choice = SLAPD_FILTER_COMPUTED;	SLAP_AD_PROXIED\|SLAP_AD_NOINSERT );
vrf.vrf_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;	if( err != LDAP_SUCCESS ) {
break;	/* unrecognized attribute description or other error */
	Debug( LDAP_DEBUG_ANY,
	"get_simple_vrFilter: conn %lu 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;
	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", op->o_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( op, ber, &vrf.vrf_ava, SLAP_MR_EQUALITY_APPROX, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
Line 1038 get_simple_vrFilter(	Line 985 get_simple_vrFilter(
break;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL1,
"get_simple_vrFilter: conn %d EXTENSIBLE\n", op->o_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( op, ber, &vrf.vrf_mra, text );	err = get_mra( op, ber, &vrf.vrf_mra, text );
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
Line 1055 get_simple_vrFilter(	Line 997 get_simple_vrFilter(

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",
op->o_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;
Line 1080 get_simple_vrFilter(	Line 1016 get_simple_vrFilter(
**filt = vrf;	**filt = vrf;
}	}

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, DETAIL2,
"get_simple_vrFilter: conn %d exit\n", op->o_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;
}	}
Line 1129 get_vrFilter( Operation *op, BerElement	Line 1060 get_vrFilter( Operation *op, BerElement
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", op->o_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 1161 get_vrFilter( Operation *op, BerElement	Line 1087 get_vrFilter( Operation *op, BerElement
}	}
*n = NULL;	*n = NULL;

#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,
"get_vrFilter: conn %d exit\n", op->o_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 );
}	}

Line 1212 vrFilter_free( Operation *op, ValuesRetu	Line 1133 vrFilter_free( Operation *op, ValuesRetu
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;
}	}

Line 1234 vrFilter2bv( Operation *op, ValuesReturn	Line 1150 vrFilter2bv( Operation *op, ValuesReturn
ber_len_t len;	ber_len_t len;

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

fstr->bv_len = sizeof("()") - 1;	fstr->bv_len = STRLENOF("()");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );	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, "()");
Line 1250 vrFilter2bv( Operation *op, ValuesReturn	Line 1166 vrFilter2bv( Operation *op, ValuesReturn
simple_vrFilter2bv( op, p, &tmp );	simple_vrFilter2bv( op, p, &tmp );

fstr->bv_len += tmp.bv_len;	fstr->bv_len += tmp.bv_len;
fstr->bv_val = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	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 );
Line 1266 simple_vrFilter2bv( Operation *op, Value	Line 1183 simple_vrFilter2bv( Operation *op, Value
ber_len_t len;	ber_len_t len;

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

Line 1275 simple_vrFilter2bv( Operation *op, Value	Line 1193 simple_vrFilter2bv( Operation *op, Value
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );	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 + STRLENOF("(=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1289 simple_vrFilter2bv( Operation *op, Value	Line 1207 simple_vrFilter2bv( Operation *op, Value
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );	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 + STRLENOF("(>=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1303 simple_vrFilter2bv( Operation *op, Value	Line 1221 simple_vrFilter2bv( Operation *op, Value
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );	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 + STRLENOF("(<=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1317 simple_vrFilter2bv( Operation *op, Value	Line 1235 simple_vrFilter2bv( Operation *op, Value
filter_escape_value_x( &vrf->vrf_av_value, &tmp, op->o_tmpmemctx );	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 + STRLENOF("(~=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1328 simple_vrFilter2bv( Operation *op, Value	Line 1246 simple_vrFilter2bv( Operation *op, Value

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 );	STRLENOF("(=*)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 128, op->o_tmpmemctx );	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=*)",
Line 1340 simple_vrFilter2bv( Operation *op, Value	Line 1258 simple_vrFilter2bv( Operation *op, Value
filter_escape_value_x( &vrf->vrf_sub_initial, &tmp, op->o_tmpmemctx );	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 = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1353 simple_vrFilter2bv( Operation *op, Value	Line 1272 simple_vrFilter2bv( Operation *op, Value
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_x( &vrf->vrf_sub_any[i], &tmp, op->o_tmpmemctx );	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 = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1371 simple_vrFilter2bv( Operation *op, Value	Line 1292 simple_vrFilter2bv( Operation *op, Value
filter_escape_value_x( &vrf->vrf_sub_final, &tmp, op->o_tmpmemctx );	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 = op->o_tmprealloc( fstr->bv_val, fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1384 simple_vrFilter2bv( Operation *op, Value	Line 1306 simple_vrFilter2bv( Operation *op, Value

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 );	STRLENOF("(=*)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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=*)",
Line 1403 simple_vrFilter2bv( Operation *op, Value	Line 1325 simple_vrFilter2bv( Operation *op, Value
}	}

fstr->bv_len = ad.bv_len +	fstr->bv_len = ad.bv_len +
( vrf->vrf_mr_dnattrs ? sizeof(":dn")-1 : 0 ) +	( vrf->vrf_mr_dnattrs ? STRLENOF(":dn") : 0 ) +
( vrf->vrf_mr_rule_text.bv_len ? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) +	( vrf->vrf_mr_rule_text.bv_len
tmp.bv_len + ( sizeof("(:=)") - 1 );	? vrf->vrf_mr_rule_text.bv_len+1 : 0 ) +
	tmp.bv_len + STRLENOF("(:=)");
fstr->bv_val = op->o_tmpalloc( fstr->bv_len + 1, op->o_tmpmemctx );	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)",
Line 1422 simple_vrFilter2bv( Operation *op, Value	Line 1345 simple_vrFilter2bv( Operation *op, Value
ber_str2bv_x(	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 ? STRLENOF("(?=false)") :
vrf->vrf_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :	vrf->vrf_result == LDAP_COMPARE_TRUE ? STRLENOF("(?=true)") :
vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :	vrf->vrf_result == SLAPD_COMPARE_UNDEFINED
sizeof("(?=error)")-1,	? STRLENOF("(?=undefined)") : STRLENOF("(?=error)"),
1, fstr, op->o_tmpmemctx );	1, fstr, op->o_tmpmemctx );
break;	break;

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

Removed from v.1.115.2.2
changed lines
	Added in v.1.134.2.1