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.114 and 1.116

version 1.114, 2003/04/29 18:12:00	version 1.116, 2003/09/29 12:09:31
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.113 2003/04/29 16:13:10 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.115 2003/04/29 18:40:26 hyc Exp $ */
/*	/*
* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 26 static int get_ssa(	Line 26 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 252 get_filter(	Line 257 get_filter(

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

switch( f.f_result ) {	switch( fresult ) {
case LDAP_COMPARE_TRUE:	case LDAP_COMPARE_TRUE:
f.f_result = LDAP_COMPARE_FALSE;	f.f_result = LDAP_COMPARE_FALSE;
break;	break;
Line 854 filter2bv( Filter f, struct berval fst	Line 859 filter2bv( Filter f, struct berval fst
filter2bv_x( &op, f, fstr );	filter2bv_x( &op, f, fstr );
}	}

int	static int
filter_escape_value_x(	filter_escape_value_x(
struct berval *in,	struct berval *in,
struct berval *out,	struct berval *out,

Removed from v.1.114
changed lines
	Added in v.1.116