upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-05 14:42:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

NVALUES: fix a couple of value_find_ex() calls

Browse source
This commit is contained in:
Kurt Zeilenga 2003-03-15 22:47:17 +00:00
parent 776e3f2248
commit 3972e13fc3
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
servers/slapd/acl.c
View file

@ -904,8 +904,15 @@ dn_match_cleanup:;
at = attrs_find( at->a_next, b->a_dn_at ) )
{
if( value_find_ex( b->a_dn_at,
#ifdef SLAP_NVALUES
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
at->a_nvals ? at->a_nvals : at->a_vals,
#else
SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
at->a_vals, &bv ) == 0 )
at->a_vals,
#endif
&bv ) == 0 )
{
/* found it */
match = 1;

5
servers/slapd/back-bdb/compare.c
View file

@ -127,8 +127,9 @@ dn2entry_retry:
#ifdef SLAP_NVALUES
if ( value_find_ex( ava->aa_desc,
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
a->a_vals, &ava->aa_value ) == 0 )
SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
a->a_nvals ? a->a_nvals : a->a_vals, &ava->aa_value ) == 0 )
#else
if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 )
#endif

10
servers/slapd/back-bdb/group.c
View file

@ -216,7 +216,15 @@ dn2entry_retry:
group_oc_name, group_at_name, 0 );
#endif
if( value_find_ex( group_at, 0, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
#ifdef SLAP_NVALUES
if( value_find_ex( group_at, SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH
| SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
attr->a_nvals ? attr->a_nvals : attr->a_vals,
op_ndn ) != LDAP_SUCCESS )
#else
if( value_find_ex( group_at, 0, attr->a_vals, op_ndn ) != LDAP_SUCCESS )
#endif
{
#ifdef NEW_LOGGING
LDAP_LOG( BACK_BDB, DETAIL1,
"bdb_group: \"%s\" not in \"%s\": %s\n",