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.95 and 1.96

version 1.95, 2003/03/15 22:59:14	version 1.96, 2003/03/16 05:41:53
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.94 2003/03/15 18:45:36 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.95 2003/03/15 22:59:14 kurt Exp $ */
/*	/*
* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.	* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file	* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 36 static int get_simple_vrFilter(	Line 36 static int get_simple_vrFilter(
ValuesReturnFilter **f,	ValuesReturnFilter **f,
const char **text );	const char **text );

	#ifdef SLAP_NVALUES
	#define XXX 1
	#endif

int	int
get_filter(	get_filter(
Line 210 get_filter(	Line 213 get_filter(
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
#if XXX	#ifdef XXX
assert( f->f_and != NULL );	assert( f->f_and != NULL );
#endif	#endif
break;	break;
Line 226 get_filter(	Line 229 get_filter(
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
#if XXX
assert( f->f_or != NULL );
#endif
break;	break;

case LDAP_FILTER_NOT:	case LDAP_FILTER_NOT:
Line 243 get_filter(	Line 243 get_filter(
if ( err != LDAP_SUCCESS ) {	if ( err != LDAP_SUCCESS ) {
break;	break;
}	}
#if XXX
assert( f->f_not != NULL );
#endif
break;	break;

case LDAP_FILTER_EXT:	case LDAP_FILTER_EXT:
Line 261 get_filter(	Line 258 get_filter(
break;	break;
}	}

#if nothosed	#ifdef XXX
assert( f->f_mra != NULL );	assert( f->f_mra != NULL );
#endif	#endif
break;	break;
Line 324 get_filter_list( Connection *conn, BerEl	Line 321 get_filter_list( Connection *conn, BerEl
Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
#endif	#endif
new = f;	new = f;
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;	for ( tag = ber_first_element( ber, &len, &last );
	tag != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) )	tag = ber_next_element( ber, &len, last ) )
{	{
err = get_filter( conn, ber, new, text );	err = get_filter( conn, ber, new, text );

Removed from v.1.95
changed lines
	Added in v.1.96