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.115.2.4 and 1.115.2.5

version 1.115.2.4, 2004/01/17 18:36:42	version 1.115.2.5, 2004/02/23 22:08:05
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.115.2.3 2004/01/01 18:16:33 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.115.2.4 2004/01/17 18:36:42 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-2004 The OpenLDAP Foundation.	* Copyright 1998-2004 The OpenLDAP Foundation.
Line 201 get_filter(	Line 201 get_filter(

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	/* unrecognized attribute description or other error */
	#ifdef NEW_LOGGING
	LDAP_LOG( FILTER, ERR,
	"get_filter: conn %d unknown attribute "
	"type=%s (%d)\n",
	op->o_connid, type.bv_val, err );
	#else
	Debug( LDAP_DEBUG_ANY,
	"get_filter: conn %d unknown attribute "
	"type=%s (%d)\n",
	op->o_connid, type.bv_val, err );
	#endif

f.f_choice = SLAPD_FILTER_COMPUTED;	f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = LDAP_COMPARE_FALSE;	f.f_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;	err = LDAP_SUCCESS;
Line 423 get_ssa(	Line 435 get_ssa(
rc = slap_bv2ad( &desc, &ssa.sa_desc, text );	rc = slap_bv2ad( &desc, &ssa.sa_desc, text );

if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
	#ifdef NEW_LOGGING
	LDAP_LOG( FILTER, ERR,
	"get_ssa: conn %d d unknown attribute type=%s (%d)\n",
	op->o_connid, desc.bv_val, rc );
	#else
	Debug( LDAP_DEBUG_ANY,
	"get_ssa: conn %d unknown attribute type=%s (%d)\n",
	op->o_connid, desc.bv_val, rc );
	#endif

/* skip over the rest of this filter */	/* skip over the rest of this filter */
for ( tag = ber_first_element( ber, &len, &last );	for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT;	tag != LBER_DEFAULT;
Line 1031 get_simple_vrFilter(	Line 1053 get_simple_vrFilter(

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */	/* unrecognized attribute description or other error */
	#ifdef NEW_LOGGING
	LDAP_LOG( FILTER, ERR,
	"get_simple_vrFilter: conn %d unknown "
	"attribute type=%s (%d)\n",
	op->o_connid, type.bv_val, err );
	#else
	Debug( LDAP_DEBUG_ANY,
	"get_simple_vrFilter: conn %d unknown "
	"attribute type=%s (%d)\n",
	op->o_connid, type.bv_val, err );
	#endif

vrf.vrf_choice = SLAPD_FILTER_COMPUTED;	vrf.vrf_choice = SLAPD_FILTER_COMPUTED;
vrf.vrf_result = LDAP_COMPARE_FALSE;	vrf.vrf_result = LDAP_COMPARE_FALSE;
err = LDAP_SUCCESS;	err = LDAP_SUCCESS;

Removed from v.1.115.2.4
changed lines
	Added in v.1.115.2.5