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.37 and 1.38

version 1.37, 2000/05/16 20:04:49	version 1.38, 2000/05/17 18:08:13
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.36 2000/05/16 19:54:24 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.37 2000/05/16 20:04:49 kurt 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 94 get_filter(	Line 94 get_filter(
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, text )) != LDAP_SUCCESS ) {	#ifdef SLAPD_SCHEMA_NOT_COMPAT
	err = get_ava( ber, &f->f_ava, SLAP_MR_EQUALITY, text );
	#else
	err = get_ava( ber, &f->f_ava, text );
	#endif
	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}


#ifdef SLAPD_SCHEMA_NOT_COMPAT	#ifdef SLAPD_SCHEMA_NOT_COMPAT
assert( f->f_ava != NULL );	assert( f->f_ava != NULL );

Line 127 get_filter(	Line 131 get_filter(
case LDAP_FILTER_GE:	case LDAP_FILTER_GE:
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );

if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {	#ifdef SLAPD_SCHEMA_NOT_COMPAT
	err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
	#else
	err = get_ava( ber, &f->f_ava, text );
	#endif
	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}

Line 152 get_filter(	Line 161 get_filter(
case LDAP_FILTER_LE:	case LDAP_FILTER_LE:
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );

if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {	#ifdef SLAPD_SCHEMA_NOT_COMPAT
	err = get_ava( ber, &f->f_ava, SLAP_MR_ORDERING, text );
	#else
	err = get_ava( ber, &f->f_ava, text );
	#endif
	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}


#ifdef SLAPD_SCHEMA_NOT_COMPAT	#ifdef SLAPD_SCHEMA_NOT_COMPAT
*fstr = ch_malloc( sizeof("(<=)")	*fstr = ch_malloc( sizeof("(<=)")
+ f->f_av_desc->ad_cname->bv_len	+ f->f_av_desc->ad_cname->bv_len
Line 214 get_filter(	Line 229 get_filter(
case LDAP_FILTER_APPROX:	case LDAP_FILTER_APPROX:
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );

if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {	#ifdef SLAPD_SCHEMA_NOT_COMPAT
	err = get_ava( ber, &f->f_ava, SLAP_MR_APPROX, text );
	#else
	err = get_ava( ber, &f->f_ava, text );
	#endif
	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}

Removed from v.1.37
changed lines
	Added in v.1.38