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

ITS#6715: Fix slap_sort_vals(attr with 1 value)

Browse Source 
Also rearrange slightly to silence gcc -Wuninitialized, get a single
exit point, and skip the unnecessary sorting of the single value.
This commit is contained in:
Hallvard Furuseth 2010-11-19 12:21:34 +00:00
parent 9c1eae14a7
commit efcb0ad5a3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
servers/slapd/modify.c
View File

@ -684,7 +684,7 @@ slap_sort_vals(
AttributeDescription *ad; AttributeDescription *ad;
MatchingRule *mr; MatchingRule *mr;
int istack[sizeof(int)*16]; int istack[sizeof(int)*16];
int i, j, k, l, ir, jstack, match, *ix, itmp, nvals, rc; int i, j, k, l, ir, jstack, match, *ix, itmp, nvals, rc = LDAP_SUCCESS;
int is_norm; int is_norm;
struct berval a, *cv; struct berval a, *cv;
@ -705,6 +705,8 @@ slap_sort_vals(
ad = ml->sml_desc; ad = ml->sml_desc;
nvals = ml->sml_numvals; nvals = ml->sml_numvals;
if ( nvals <= 1 )
goto ret;
/* For Modifications, sml_nvalues is NULL if normalization wasn't needed. /* For Modifications, sml_nvalues is NULL if normalization wasn't needed.
* For Attributes, sml_nvalues == sml_values when normalization isn't needed. * For Attributes, sml_nvalues == sml_values when normalization isn't needed.
@ -834,15 +836,14 @@ slap_sort_vals(
slap_sl_free( ix, ctx ); slap_sl_free( ix, ctx );
if ( rc != LDAP_SUCCESS ) { if ( rc == LDAP_SUCCESS && match == 0 ) {
return rc;
} else if ( match == 0 ) {
/* value exists already */ /* value exists already */
assert( i >= 0 ); assert( i >= 0 );
assert( i < nvals ); assert( i < nvals );
return LDAP_TYPE_OR_VALUE_EXISTS; rc = LDAP_TYPE_OR_VALUE_EXISTS;
} }
return LDAP_SUCCESS; ret:
return rc;
} }
/* Enter with bv->bv_len = sizeof buffer, returns with /* Enter with bv->bv_len = sizeof buffer, returns with