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.57 and 1.58

version 1.57, 2001/01/17 15:35:53	version 1.58, 2001/05/23 23:07:00
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.56 2001/01/15 18:17:30 gwilliams Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.57 2001/01/17 15:35:53 gwilliams 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 544 get_substring_filter(	Line 544 get_substring_filter(
#else	#else
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );
#endif	#endif
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 568 get_substring_filter(	Line 572 get_substring_filter(
#else	#else
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
#endif	#endif

	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 591 get_substring_filter(	Line 601 get_substring_filter(
#else	#else
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );
#endif	#endif

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 ) {

Removed from v.1.57
changed lines
	Added in v.1.58