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.5 and 1.118

version 1.115.2.5, 2004/02/23 22:08:05	version 1.118, 2004/01/01 18:15:30
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.4 2004/01/17 18:36:42 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.117 2003/11/27 00:17:15 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 413 get_ssa(	Line 401 get_ssa(
SubstringsAssertion ssa;	SubstringsAssertion ssa;

*text = "error decoding filter";	*text = "error decoding filter";
*out = NULL;

#ifdef NEW_LOGGING	#ifdef NEW_LOGGING
LDAP_LOG( FILTER, ENTRY,	LDAP_LOG( FILTER, ENTRY,
Line 435 get_ssa(	Line 422 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 612 return_error:	Line 589 return_error:
Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_ssa\n", 0, 0, 0 );
#endif	#endif

return rc /* LDAP_SUCCESS */ ;	return LDAP_SUCCESS;
}	}

void	void
Line 689 filter_free( Filter *f )	Line 666 filter_free( Filter *f )
void	void
filter2bv_x( Operation op, Filter f, struct berval *fstr )	filter2bv_x( Operation op, Filter f, struct berval *fstr )
{	{
int i;	int i;
Filter *p;	Filter *p;
struct berval tmp,	struct berval tmp;
ber_bvfalse = BER_BVC( "(?=false)" ),	ber_len_t len;
ber_bvtrue = BER_BVC( "(?=true)" ),
ber_bvundefined = BER_BVC( "(?=undefined)" ),
ber_bverror = BER_BVC( "(?=error)" ),
ber_bvunknown = BER_BVC( "(?=unknown)" );
ber_len_t len;

if ( f == NULL ) {	if ( f == NULL ) {
ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );	ber_str2bv_x( "No filter!", sizeof("No filter!")-1, 1, fstr, op->o_tmpmemctx );
Line 877 filter2bv_x( Operation op, Filter f, s	Line 849 filter2bv_x( Operation op, Filter f, s
} break;	} break;

case SLAPD_FILTER_COMPUTED:	case SLAPD_FILTER_COMPUTED:
switch ( f->f_result ) {	ber_str2bv_x(
case LDAP_COMPARE_FALSE:	f->f_result == LDAP_COMPARE_FALSE ? "(?=false)" :
tmp = ber_bvfalse;	f->f_result == LDAP_COMPARE_TRUE ? "(?=true)" :
break;	f->f_result == SLAPD_COMPARE_UNDEFINED ? "(?=undefined)" :
	"(?=error)",
case LDAP_COMPARE_TRUE:	f->f_result == LDAP_COMPARE_FALSE ? sizeof("(?=false)")-1 :
tmp = ber_bvtrue;	f->f_result == LDAP_COMPARE_TRUE ? sizeof("(?=true)")-1 :
break;	f->f_result == SLAPD_COMPARE_UNDEFINED ? sizeof("(?=undefined)")-1 :
	sizeof("(?=error)")-1,
case SLAPD_COMPARE_UNDEFINED:	1, fstr, op->o_tmpmemctx );
tmp = ber_bvundefined;
break;

default:
tmp = ber_bverror;
break;
}

ber_dupbv_x( fstr, &tmp, op->o_tmpmemctx );
break;	break;

default:	default:
ber_dupbv_x( fstr, &ber_bvunknown, op->o_tmpmemctx );	ber_str2bv_x( "(?=unknown)", sizeof("(?=unknown)")-1,
	1, fstr, op->o_tmpmemctx );
break;	break;
}	}
}	}
Line 1053 get_simple_vrFilter(	Line 1017 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.5
changed lines
	Added in v.1.118