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.159 and 1.160

version 1.159, 2011/01/29 11:29:20	version 1.160, 2011/01/29 13:16:02
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.158 2011/01/12 13:41:34 hallvard Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.159 2011/01/29 11:29:20 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-2011 The OpenLDAP Foundation.	* Copyright 1998-2011 The OpenLDAP Foundation.
Line 601 filter2bv_undef_x( Operation *op, Filter	Line 601 filter2bv_undef_x( Operation *op, Filter
ber_bvundefined = BER_BVC( "(?=undefined)" ),	ber_bvundefined = BER_BVC( "(?=undefined)" ),
ber_bverror = BER_BVC( "(?=error)" ),	ber_bverror = BER_BVC( "(?=error)" ),
ber_bvunknown = BER_BVC( "(?=unknown)" ),	ber_bvunknown = BER_BVC( "(?=unknown)" ),
ber_bvnone = BER_BVC( "(?=none)" );	ber_bvnone = BER_BVC( "(?=none)" ),
	ber_bvF = BER_BVC( "(\|)" ),
	ber_bvT = BER_BVC( "(&)" );
ber_len_t len;	ber_len_t len;
ber_tag_t choice;	ber_tag_t choice;
int undef, undef2;	int undef, undef2;
Line 818 simple:	Line 820 simple:
case SLAPD_FILTER_COMPUTED:	case SLAPD_FILTER_COMPUTED:
switch ( f->f_result ) {	switch ( f->f_result ) {
case LDAP_COMPARE_FALSE:	case LDAP_COMPARE_FALSE:
tmp = ber_bvfalse;	tmp = ( noundef ? ber_bvF : ber_bvfalse );
break;	break;

case LDAP_COMPARE_TRUE:	case LDAP_COMPARE_TRUE:
tmp = ber_bvtrue;	tmp = ( noundef ? ber_bvT : ber_bvtrue );
break;	break;

case SLAPD_COMPARE_UNDEFINED:	case SLAPD_COMPARE_UNDEFINED:

Removed from v.1.159
changed lines
	Added in v.1.160