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.134.2.4 and 1.156

version 1.134.2.4, 2007/09/27 21:14:23	version 1.156, 2010/08/29 14:27:08
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.134.2.3 2007/08/31 23:13:59 quanah Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.155 2010/04/13 20:18:06 kurt 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-2007 The OpenLDAP Foundation.	* Copyright 1998-2010 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 32	Line 32
#include <ac/string.h>	#include <ac/string.h>

#include "slap.h"	#include "slap.h"
	#include "lutil.h"

const Filter *slap_filter_objectClass_pres;	const Filter *slap_filter_objectClass_pres;
const struct berval *slap_filterstr_objectClass_pres;	const struct berval *slap_filterstr_objectClass_pres;
Line 347 get_ssa(	Line 348 get_ssa(
{	{
ber_tag_t tag;	ber_tag_t tag;
ber_len_t len;	ber_len_t len;
ber_tag_t rc;	int rc;
struct berval desc, value, nvalue;	struct berval desc, value, nvalue;
char *last;	char *last;
SubstringsAssertion ssa;	SubstringsAssertion ssa;
Line 384 get_ssa(	Line 385 get_ssa(

rc = LDAP_PROTOCOL_ERROR;	rc = LDAP_PROTOCOL_ERROR;

	/* If there is no substring matching rule, there's nothing
	* we can do with this filter. But we continue to parse it
	* for logging purposes.
	*/
	if ( ssa.sa_desc->ad_type->sat_substr == NULL ) {
	f->f_choice \|= SLAPD_FILTER_UNDEFINED;
	Debug( LDAP_DEBUG_FILTER,
	"get_ssa: no substring matching rule for attributeType %s\n",
	desc.bv_val, 0, 0 );
	}

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 ) )
Line 443 get_ssa(	Line 455 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 ) {
	f->f_choice \|= SLAPD_FILTER_UNDEFINED;
	Debug( LDAP_DEBUG_FILTER,
	"get_ssa: illegal value for attributeType %s (%d) %s\n",
	desc.bv_val, rc, *text );
	ber_dupbv_x( &nvalue, &value, op->o_tmpmemctx );
	}

switch ( tag ) {	switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:	case LDAP_SUBSTRING_INITIAL:
Line 477 return_error:	Line 495 return_error:
return rc;	return rc;
}	}

	*text = NULL;
rc = LDAP_SUCCESS;	rc = LDAP_SUCCESS;
}	}

Line 490 return_error:	Line 509 return_error:
}	}

void	void
filter_free_x( Operation op, Filter f )	filter_free_x( Operation op, Filter f, int freeme )
{	{
Filter p, next;	Filter p, next;

Line 502 filter_free_x( Operation op, Filter f	Line 521 filter_free_x( Operation op, Filter f

switch ( f->f_choice ) {	switch ( f->f_choice ) {
case LDAP_FILTER_PRESENT:	case LDAP_FILTER_PRESENT:
	if ( f->f_desc->ad_flags & SLAP_DESC_TEMPORARY )
	op->o_tmpfree( f->f_desc, op->o_tmpmemctx );
break;	break;

case LDAP_FILTER_EQUALITY:	case LDAP_FILTER_EQUALITY:
Line 529 filter_free_x( Operation op, Filter f	Line 550 filter_free_x( Operation op, 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_x( op, p );	filter_free_x( op, p, 1 );
}	}
break;	break;

Line 546 filter_free_x( Operation op, Filter f	Line 567 filter_free_x( Operation op, Filter f
break;	break;
}	}

op->o_tmpfree( f, op->o_tmpmemctx );	if ( freeme ) {
	op->o_tmpfree( f, op->o_tmpmemctx );
	}
}	}

void	void
Line 558 filter_free( Filter *f )	Line 581 filter_free( Filter *f )
op.o_hdr = &ohdr;	op.o_hdr = &ohdr;
op.o_tmpmemctx = slap_sl_context( f );	op.o_tmpmemctx = slap_sl_context( f );
op.o_tmpmfuncs = &slap_sl_mfuncs;	op.o_tmpmfuncs = &slap_sl_mfuncs;
filter_free_x( &op, f );	filter_free_x( &op, f, 1 );
}	}

void	void
Line 566 filter2bv_x( Operation op, Filter f, s	Line 589 filter2bv_x( Operation op, Filter f, s
{	{
int i;	int i;
Filter *p;	Filter *p;
struct berval tmp;	struct berval tmp, value;
static struct berval	static struct berval
ber_bvfalse = BER_BVC( "(?=false)" ),	ber_bvfalse = BER_BVC( "(?=false)" ),
ber_bvtrue = BER_BVC( "(?=true)" ),	ber_bvtrue = BER_BVC( "(?=true)" ),
Line 605 filter2bv_x( Operation op, Filter f, s	Line 628 filter2bv_x( Operation op, Filter f, s
sign = "~=";	sign = "~=";

simple:	simple:
filter_escape_value_x( &f->f_av_value, &tmp, op->o_tmpmemctx );	value = f->f_av_value;
	if ( f->f_av_desc->ad_type->sat_equality &&
	!undef &&
	( f->f_av_desc->ad_type->sat_equality->smr_usage & SLAP_MR_MUTATION_NORMALIZER ))
	{
	f->f_av_desc->ad_type->sat_equality->smr_normalize(
	(SLAP_MR_DENORMALIZE\|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX),
	NULL, NULL, &f->f_av_value, &value, op->o_tmpmemctx );
	}

	filter_escape_value_x( &value, &tmp, op->o_tmpmemctx );
/* NOTE: tmp can legitimately be NULL (meaning empty)	/* NOTE: tmp can legitimately be NULL (meaning empty)
* since in a Filter values in AVAs are supposed	* since in a Filter values in AVAs are supposed
* to have been normalized, meaning that an empty value	* to have been normalized, meaning that an empty value
Line 621 simple:	Line 654 simple:
f->f_av_desc->ad_cname.bv_val, sign,	f->f_av_desc->ad_cname.bv_val, sign,
tmp.bv_len ? tmp.bv_val : "" );	tmp.bv_len ? tmp.bv_val : "" );

	if ( value.bv_val != f->f_av_value.bv_val ) {
	ber_memfree_x( value.bv_val, op->o_tmpmemctx );
	}

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

Removed from v.1.134.2.4
changed lines
	Added in v.1.156