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.13 and 1.134.2.17

version 1.134.2.13, 2008/09/06 01:01:02	version 1.134.2.17, 2009/08/13 00:48:32
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.12 2008/02/18 22:25:47 hyc Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.134.2.16 2009/01/22 00:01:01 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-2008 The OpenLDAP Foundation.	* Copyright 1998-2009 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 348 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 385 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 444 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 492 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 531 filter_free_x( Operation op, Filter f	Line 548 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 548 filter_free_x( Operation op, Filter f	Line 565 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 560 filter_free( Filter *f )	Line 579 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

Removed from v.1.134.2.13
changed lines
	Added in v.1.134.2.17