mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better fix for prev

Browse Source
This commit is contained in:
Howard Chu 2009-02-27 01:31:31 +00:00
parent 6345812f49
commit 7549abb063
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/slapd/back-ldap/search.c
View File

@ -819,10 +819,8 @@ ldap_build_entry(
if ( attr->a_desc->ad_type->sat_flags & SLAP_AT_SORTED_VAL ) {
while ( attr->a_numvals > 1 ) {
int rc = slap_sort_vals( (Modifications *)attr, &text, &i, op->o_tmpmemctx );
if ( rc != LDAP_TYPE_OR_VALUE_EXISTS ) {
attr->a_flags |= SLAP_ATTR_SORTED_VALS;
if ( rc != LDAP_TYPE_OR_VALUE_EXISTS )
break;
}
/* Strip duplicate values */
if ( attr->a_nvals != attr->a_vals )
@ -838,6 +836,7 @@ ldap_build_entry(
if ( attr->a_nvals != attr->a_vals )
BER_BVZERO(&attr->a_vals[attr->a_numvals]);
}
attr->a_flags |= SLAP_ATTR_SORTED_VALS;
}
*attrp = attr;

5
servers/slapd/back-meta/search.c
View File

@ -2168,10 +2168,8 @@ next_attr:;
while ( attr->a_numvals > 1 ) {
int i;
int rc = slap_sort_vals( (Modifications *)attr, &text, &i, op->o_tmpmemctx );
if ( rc != LDAP_TYPE_OR_VALUE_EXISTS ) {
attr->a_flags |= SLAP_ATTR_SORTED_VALS;
if ( rc != LDAP_TYPE_OR_VALUE_EXISTS )
break;
}
/* Strip duplicate values */
if ( attr->a_nvals != attr->a_vals )
@ -2187,6 +2185,7 @@ next_attr:;
if ( attr->a_nvals != attr->a_vals )
BER_BVZERO(&attr->a_vals[attr->a_numvals]);
}
attr->a_flags |= SLAP_ATTR_SORTED_VALS;
}
}
}