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.6 and 1.134.2.7

version 1.134.2.6, 2007/10/05 06:25:03	version 1.134.2.7, 2007/10/05 06:34:26
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.5 2007/09/27 21:38:25 ralf Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.134.2.6 2007/10/05 06:25:03 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-2007 The OpenLDAP Foundation.	* Copyright 1998-2007 The OpenLDAP Foundation.
Line 568 filter2bv_x( Operation op, Filter f, s	Line 568 filter2bv_x( Operation op, Filter f, s
int i;	int i;
Filter *p;	Filter *p;
struct berval tmp;	struct berval tmp;
char uuid[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
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 594 filter2bv_x( Operation op, Filter f, s	Line 593 filter2bv_x( Operation op, Filter f, s
fstr->bv_len = STRLENOF("(=)");	fstr->bv_len = STRLENOF("(=)");
sign = "=";	sign = "=";
if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {	if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
	tmp.bv_val = op->o_tmpalloc( LDAP_LUTIL_UUIDSTR_BUFSIZE, op->o_tmpmemctx );
tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,	tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,
f->f_av_value.bv_len, uuid, LDAP_LUTIL_UUIDSTR_BUFSIZE );	f->f_av_value.bv_len, tmp.bv_val, LDAP_LUTIL_UUIDSTR_BUFSIZE );
assert( tmp.bv_len > 0 );	assert( tmp.bv_len > 0 );
tmp.bv_val = uuid;
goto escaped;	goto escaped;
}	}
goto simple;	goto simple;

Removed from v.1.134.2.6
changed lines
	Added in v.1.134.2.7