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.3 and 1.122

version 1.115.2.3, 2004/01/01 18:16:33	version 1.122, 2004/04/20 01:44:57
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.2 2003/12/01 00:58:34 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.121 2004/03/09 06:08:04 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-2004 The OpenLDAP Foundation.	* Copyright 1998-2004 The OpenLDAP Foundation.
Line 201 get_filter(	Line 201 get_filter(

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

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;
Line 401 get_ssa(	Line 413 get_ssa(
SubstringsAssertion ssa;	SubstringsAssertion ssa;

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

#ifdef NEW_LOGGING	#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,	LDAP_LOG( FILTER, ENTRY,
Line 422 get_ssa(	Line 435 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 ) {
	#ifdef NEW_LOGGING
	LDAP_LOG( FILTER, ERR,
	"get_ssa: conn %d d unknown attribute type=%s (%d)\n",
	op->o_connid, desc.bv_val, rc );
	#else
	Debug( LDAP_DEBUG_ANY,
	"get_ssa: conn %d unknown attribute type=%s (%d)\n",
	op->o_connid, desc.bv_val, rc );
	#endif

/* skip over the rest of this filter */	/* skip over the rest of this filter */
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT;	tag != LBER_DEFAULT;
Line 504 get_ssa(	Line 527 get_ssa(
\|\| ssa.sa_any != NULL	\|\| ssa.sa_any != NULL
\|\| ssa.sa_final.bv_val != NULL )	\|\| ssa.sa_final.bv_val != NULL )
{	{
sl_free( nvalue.bv_val, op->o_tmpmemctx );	slap_sl_free( nvalue.bv_val, op->o_tmpmemctx );
goto return_error;	goto return_error;
}	}

Line 521 get_ssa(	Line 544 get_ssa(
#endif	#endif

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

Line 538 get_ssa(	Line 561 get_ssa(
#endif	#endif

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

Line 557 get_ssa(	Line 580 get_ssa(
#endif	#endif

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

return_error:	return_error:
#ifdef NEW_LOGGING	#ifdef NEW_LOGGING
Line 568 return_error:	Line 591 return_error:
Debug( LDAP_DEBUG_FILTER, " error=%ld\n",	Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
(long) rc, 0, 0 );	(long) rc, 0, 0 );
#endif	#endif
sl_free( ssa.sa_initial.bv_val, op->o_tmpmemctx );	slap_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 589 return_error:	Line 612 return_error:
Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );
#endif	#endif

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

void	void
Line 658 filter_free( Filter *f )	Line 681 filter_free( Filter *f )
{	{
Operation op;	Operation op;

op.o_tmpmemctx = sl_context( f );	op.o_tmpmemctx = slap_sl_context( f );
op.o_tmpmfuncs = &sl_mfuncs;	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;
}	}

Line 849 filter2bv_x( Operation op, Filter f, s	Line 879 filter2bv_x( Operation op, Filter f, s
} 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 :
f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
sizeof("(?=error)")-1,
1, fstr, op->o_tmpmemctx );
break;

	case LDAP_COMPARE_TRUE:
	tmp = ber_bvtrue;
	break;

	case SLAPD_COMPARE_UNDEFINED:
	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 889 filter_escape_value_x(	Line 927 filter_escape_value_x(
assert( out );	assert( out );

i = in->bv_len * 3 + 1;	i = in->bv_len * 3 + 1;
out->bv_val = ctx ? sl_malloc( i, ctx ) : ch_malloc( i );	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 1017 get_simple_vrFilter(	Line 1055 get_simple_vrFilter(

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	/* unrecognized attribute description or other error */
	#ifdef NEW_LOGGING
	LDAP_LOG( FILTER, ERR,
	"get_simple_vrFilter: conn %d unknown "
	"attribute type=%s (%d)\n",
	op->o_connid, type.bv_val, err );
	#else
	Debug( LDAP_DEBUG_ANY,
	"get_simple_vrFilter: conn %d unknown "
	"attribute type=%s (%d)\n",
	op->o_connid, type.bv_val, err );
	#endif

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

Removed from v.1.115.2.3
changed lines
	Added in v.1.122