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.6 and 1.13.4.7

version 1.13.4.6, 2000/10/11 02:43:58	version 1.13.4.7, 2001/06/02 00:47:49
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.5 2000/08/30 22:52:56 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.13.4.6 2000/10/11 02:43:58 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 443 get_substring_filter(	Line 443 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 461 get_substring_filter(	Line 464 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 478 get_substring_filter(	Line 487 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 ) {

Removed from v.1.13.4.6
changed lines
	Added in v.1.13.4.7