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 8f49187c5041488477c9382b0daa915685cc75e8..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] );
@@ -836,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;