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.23 and 1.24

version 1.23, 2000/02/14 19:57:40	version 1.24, 2000/02/29 22:48:01
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.22 2000/02/07 16:50:42 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.23 2000/02/14 19:57:40 kurt Exp $ */
/*	/*
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 20 static int get_substring_filter(Connecti	Line 20 static int get_substring_filter(Connecti
int	int
get_filter( Connection conn, BerElement ber, Filter filt, char fstr )	get_filter( Connection conn, BerElement ber, Filter filt, char fstr )
{	{
	ber_tag_t tag;
ber_len_t len;	ber_len_t len;
int err;	int err;
Filter *f;	Filter *f;
Line 60 get_filter( Connection *conn, BerElement	Line 61 get_filter( Connection *conn, BerElement
*	*
*/	*/

	tag = ber_peek_tag( ber, &len );

	if( tag == LBER_ERROR ) {
	return SLAPD_DISCONNECT;
	}

f = (Filter *) ch_malloc( sizeof(Filter) );	f = (Filter *) ch_malloc( sizeof(Filter) );
f->f_next = NULL;	f->f_next = NULL;

err = LDAP_SUCCESS;	err = LDAP_SUCCESS;
*fstr = NULL;	*fstr = NULL;
f->f_choice = ber_peek_tag( ber, &len );	f->f_choice = tag;

switch ( f->f_choice ) {	switch ( f->f_choice ) {
#ifndef SLAPD_SCHEMA_NOT_COMPAT	#ifdef SLAPD_SCHEMA_NOT_COMPAT
	/* not yet implemented */
	#else
case LDAP_FILTER_EQUALITY:	case LDAP_FILTER_EQUALITY:
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {	if ( (err = get_ava( ber, &f->f_ava )) == LDAP_SUCCESS ) {
Line 107 get_filter( Connection *conn, BerElement	Line 116 get_filter( Connection *conn, BerElement
case LDAP_FILTER_PRESENT:	case LDAP_FILTER_PRESENT:
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
if ( ber_scanf( ber, "a", &f->f_type ) == LBER_ERROR ) {	if ( ber_scanf( ber, "a", &f->f_type ) == LBER_ERROR ) {
err = -1;	err = SLAPD_DISCONNECT;
} else {	break;
err = LDAP_SUCCESS;
attr_normalize( f->f_type );
*fstr = ch_malloc( 5 + strlen( f->f_type ) );
sprintf( fstr, "(%s=)", f->f_type );
}	}

	err = LDAP_SUCCESS;
	attr_normalize( f->f_type );
	*fstr = ch_malloc( 5 + strlen( f->f_type ) );
	sprintf( fstr, "(%s=)", f->f_type );
break;	break;

case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
Line 164 get_filter( Connection *conn, BerElement	Line 174 get_filter( Connection *conn, BerElement
/* not yet implemented */	/* not yet implemented */
Debug( LDAP_DEBUG_ANY, "extensible match not yet implemented.\n",	Debug( LDAP_DEBUG_ANY, "extensible match not yet implemented.\n",
f->f_choice, 0, 0 );	f->f_choice, 0, 0 );
err = -1;	err = LDAP_PROTOCOL_ERROR;
break;

case LBER_DEFAULT:
Debug( LDAP_DEBUG_ANY, "decoding filter error\n",
0, 0, 0 );
err = -1;
break;	break;

default:	default:
Line 247 get_substring_filter(	Line 251 get_substring_filter(
Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );

if ( ber_scanf( ber, "{a" /}/, &f->f_sub_type ) == LBER_ERROR ) {	if ( ber_scanf( ber, "{a" /}/, &f->f_sub_type ) == LBER_ERROR ) {
return( -1 );	return SLAPD_DISCONNECT;
}	}

attr_normalize( f->f_sub_type );	attr_normalize( f->f_sub_type );
Line 265 get_substring_filter(	Line 269 get_substring_filter(

if( fstr ) {	if( fstr ) {
*fstr = ch_malloc( strlen( f->f_sub_type ) + 3 );	*fstr = ch_malloc( strlen( f->f_sub_type ) + 3 );
sprintf( *fstr, "(%s=", f->f_sub_type );	sprintf( fstr, "(%s=" /)*/, f->f_sub_type );
}	}

for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
Line 273 get_substring_filter(	Line 277 get_substring_filter(
{	{
rc = ber_scanf( ber, "O", &val );	rc = ber_scanf( ber, "O", &val );
if ( rc == LBER_ERROR ) {	if ( rc == LBER_ERROR ) {
rc = -1;	rc = SLAPD_DISCONNECT;
goto return_error;	goto return_error;
}	}

Line 368 return_error:	Line 372 return_error:
if ( f->f_sub_final == NULL ) {	if ( f->f_sub_final == NULL ) {
strcat( fstr, "" );	strcat( fstr, "" );
}	}
strcat( *fstr, ")" );	strcat( fstr, /(*/ ")" );
}	}

Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
Line 441 filter_free( Filter *f )	Line 445 filter_free( Filter *f )
}	}
break;	break;

	case SLAPD_FILTER_COMPUTED:
	break;

default:	default:
Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",	Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n",
f->f_choice, 0, 0 );	f->f_choice, 0, 0 );
Line 459 filter_print( Filter *f )	Line 466 filter_print( Filter *f )
Filter *p;	Filter *p;

if ( f == NULL ) {	if ( f == NULL ) {
fprintf( stderr, "NULL" );	fprintf( stderr, "No filter!" );
}	}

switch ( f->f_choice ) {	switch ( f->f_choice ) {
Line 532 filter_print( Filter *f )	Line 539 filter_print( Filter *f )
fprintf( stderr, "(%s=*)",	fprintf( stderr, "(%s=*)",
f->f_desc->ad_cname );	f->f_desc->ad_cname );
#else	#else
fprintf( stderr, "%s=*", f->f_type );	fprintf( stderr, "(%s=*)", f->f_type );
#endif	#endif
break;	break;

Line 548 filter_print( Filter *f )	Line 555 filter_print( Filter *f )
fprintf( stderr, /(/ ")" );	fprintf( stderr, /(/ ")" );
break;	break;

	case SLAPD_FILTER_COMPUTED:
	fprintf( stderr, "(%s)",
	f->f_result == LDAP_COMPARE_FALSE ? "false" :
	f->f_result == LDAP_COMPARE_TRUE ? "true" :
	f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" :
	"error" );
	break;

default:	default:
fprintf( stderr, "(unknown filter %lu)", f->f_choice );	fprintf( stderr, "(unknown filter %lu)", f->f_choice );
break;	break;

Removed from v.1.23
changed lines
	Added in v.1.24