fix ITS#5959 fix

[openldap] / servers / slapd / back-ldap / search.c

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 2539706e194b6cf9a74c14df5fde7bfc09b5571f..1bb236db2b26a7bbc6570a9e06662893c20dcd9e 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -766,7 +766,9 @@ ldap_build_entry(
                                        }
                                        attr->a_vals[i] = attr->a_vals[last];
                                        BER_BVZERO( &attr->a_vals[last] );
+                                       i--;
                                }
+
                        } else if ( pretty ) {
                                LBER_FREE( attr->a_vals[i].bv_val );
                                attr->a_vals[i] = pval;
@@ -801,6 +803,7 @@ ldap_build_entry(
                                        }
                                        attr->a_vals[i] = attr->a_vals[last];
                                        BER_BVZERO( &attr->a_vals[last] );
+                                       i--;
                                }
                        }
                        BER_BVZERO( &attr->a_nvals[i] );
@@ -819,10 +822,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 +839,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;