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.13.4.10 and 1.54

version 1.13.4.10, 2001/12/07 15:43:18	version 1.54, 2000/10/13 18:41:56
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.13.4.9 2001/08/31 20:24:17 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.53 2000/10/09 17:13:17 jsanchez Exp $ */
/*	/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 183 get_filter(	Line 183 get_filter(
err = slap_bv2ad( &type, &f->f_desc, text );	err = slap_bv2ad( &type, &f->f_desc, text );

if( err != LDAP_SUCCESS ) {	if( err != LDAP_SUCCESS ) {
/* unrecognized attribute description or other error */
f->f_choice = SLAPD_FILTER_COMPUTED;
f->f_result = LDAP_COMPARE_FALSE;
fstr = ch_strdup( "(unrecogized=)" );
ch_free( type.bv_val );	ch_free( type.bv_val );
err = LDAP_SUCCESS;
break;	break;
}	}

Line 260 get_filter(	Line 255 get_filter(
break;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
/* not yet implemented */	Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ANY, "extensible match not yet implemented.\n",
0, 0, 0 );	err = get_mra( ber, &f->f_mra, text );
(void) ber_skip_tag( ber, &len );	if ( err != LDAP_SUCCESS ) {
f->f_choice = SLAPD_FILTER_COMPUTED;	break;
f->f_result = SLAPD_COMPARE_UNDEFINED;	}
*fstr = ch_strdup( "(extended)" );
	assert( f->f_mra != NULL );

	filter_escape_value( f->f_mr_value, &escaped );

	*fstr = ch_malloc( sizeof("(:dn::=)")
	+ (f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_len : 0)
	+ (f->f_mr_rule ? strlen(f->f_mr_rule) : 0)
	+ escaped.bv_len );

	sprintf( *fstr, "(%s%s%s%s:=%s)",
	(f->f_mr_desc ? f->f_mr_desc->ad_cname->bv_val : ""),
	(f->f_mr_dnattrs ? ":dn" : ""),
	(f->f_mr_rule ? ":" : ""),
	(f->f_mr_rule ? f->f_mr_rule : ""),
	f->f_mr_desc->ad_cname->bv_val,
	escaped.bv_val );

	ber_memfree( escaped.bv_val );
break;	break;

default:	default:
(void) ber_scanf( ber, "x" ); /* skip the element */	(void) ber_skip_tag( ber, &len );
Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",	Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
f->f_choice, 0, 0 );	f->f_choice, 0, 0 );
f->f_choice = SLAPD_FILTER_COMPUTED;	f->f_choice = SLAPD_FILTER_COMPUTED;
Line 448 get_substring_filter(	Line 461 get_substring_filter(
switch ( tag ) {	switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:	case LDAP_SUBSTRING_INITIAL:
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );
if ( f->f_sub_initial != NULL	if ( f->f_sub_initial != NULL ) {
\|\| f->f_sub_any != NULL
\|\| f->f_sub_final != NULL )
{
ber_bvfree( value );	ber_bvfree( value );
goto return_error;	goto return_error;
}	}
Line 469 get_substring_filter(	Line 479 get_substring_filter(

case LDAP_SUBSTRING_ANY:	case LDAP_SUBSTRING_ANY:
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );

if ( f->f_sub_final != NULL ) {
ber_bvfree( value );
goto return_error;
}

if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) {	if( ber_bvecadd( &f->f_sub_any, value ) < 0 ) {
ber_bvfree( value );	ber_bvfree( value );
goto return_error;	goto return_error;
Line 492 get_substring_filter(	Line 496 get_substring_filter(

case LDAP_SUBSTRING_FINAL:	case LDAP_SUBSTRING_FINAL:
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );

if ( f->f_sub_final != NULL ) {	if ( f->f_sub_final != NULL ) {
ber_bvfree( value );	ber_bvfree( value );
goto return_error;	goto return_error;
}	}

f->f_sub_final = value;	f->f_sub_final = value;

if( fstr ) {	if( fstr ) {
Line 577 filter_free( Filter *f )	Line 579 filter_free( Filter *f )
if ( f->f_sub_final != NULL ) {	if ( f->f_sub_final != NULL ) {
ber_bvfree( f->f_sub_final );	ber_bvfree( f->f_sub_final );
}	}
ch_free( f->f_sub );
break;	break;

case LDAP_FILTER_AND:	case LDAP_FILTER_AND:

Removed from v.1.13.4.10
changed lines
	Added in v.1.54