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.89 and 1.90

version 1.89, 2003/01/20 19:21:17	version 1.90, 2003/02/27 00:54:43
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.88 2003/01/03 19:20:54 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.89 2003/01/20 19:21:17 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 414 get_substring_filter(	Line 414 get_substring_filter(
goto return_error;	goto return_error;
}	}

	#ifdef SLAP_NVALUES
	/* validate using equality matching rule validator! */
	rc = asserted_value_validate_normalize(
	f->f_sub_desc, f->f_sub_desc->ad_type->sat_substr,
	usage, &value, &bv, text );
	if( rc != LDAP_SUCCESS ) {
	goto return_error;
	}
	#else
/* validate using equality matching rule validator! */	/* validate using equality matching rule validator! */
rc = value_validate( f->f_sub_desc->ad_type->sat_equality,	rc = value_validate( f->f_sub_desc->ad_type->sat_equality,
&value, text );	&value, text );
Line 426 get_substring_filter(	Line 435 get_substring_filter(
if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
goto return_error;	goto return_error;
}	}
	#endif

value = bv;	value = bv;

Line 1423 get_substring_vrFilter(	Line 1433 get_substring_vrFilter(
goto return_error;	goto return_error;
}	}

	#ifdef SLAP_NVALUES
	/* validate using equality matching rule validator! */
	rc = asserted_value_validate_normalize(
	vrf->vrf_sub_desc, vrf->vrf_sub_desc->ad_type->sat_substr,
	usage, &value, &bv, text );
	if( rc != LDAP_SUCCESS ) {
	goto return_error;
	}
	#else
/* valiate using equality matching rule validator! */	/* valiate using equality matching rule validator! */
rc = value_validate( vrf->vrf_sub_desc->ad_type->sat_equality,	rc = value_validate( vrf->vrf_sub_desc->ad_type->sat_equality,
&value, text );	&value, text );
Line 1435 get_substring_vrFilter(	Line 1454 get_substring_vrFilter(
if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
goto return_error;	goto return_error;
}	}
	#endif

value = bv;	value = bv;

Removed from v.1.89
changed lines
	Added in v.1.90