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.103 and 1.104

version 1.103, 2003/03/30 07:03:54	version 1.104, 2003/04/05 01:35:17
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.102 2003/03/18 13:38:40 ando Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.103 2003/03/30 07:03:54 hyc 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	#define XXX 1
#endif

int	int
get_filter(	get_filter(
Line 430 get_ssa(	Line 428 get_ssa(
goto return_error;	goto return_error;
}	}

#ifdef SLAP_NVALUES
/* validate/normalize using equality matching rule validator! */	/* validate/normalize using equality matching rule validator! */
rc = asserted_value_validate_normalize(	rc = asserted_value_validate_normalize(
ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,	ssa.sa_desc, ssa.sa_desc->ad_type->sat_equality,
Line 439 get_ssa(	Line 436 get_ssa(
if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
goto return_error;	goto return_error;
}	}
#else
/* validate using equality matching rule validator! */
rc = value_validate( ssa.sa_desc->ad_type->sat_equality,
&value, text );
if( rc != LDAP_SUCCESS ) {
goto return_error;
}

rc = value_normalize( ssa.sa_desc, usage,
&value, &nvalue, text );

if( rc != LDAP_SUCCESS ) {
goto return_error;
}
#endif

rc = LDAP_PROTOCOL_ERROR;	rc = LDAP_PROTOCOL_ERROR;

Line 1459 get_substring_vrFilter(	Line 1441 get_substring_vrFilter(
goto return_error;	goto return_error;
}	}

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

rc = value_normalize( vrf->vrf_sub_desc, usage,
&value, &bv, text );
if( rc != LDAP_SUCCESS ) {
goto return_error;
}
#endif

value = bv;	value = bv;

Removed from v.1.103
changed lines
	Added in v.1.104