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 389278cb11321e5145729c81e3651e80cad6806d..1bb236db2b26a7bbc6570a9e06662893c20dcd9e 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -732,6 +732,10 @@ ldap_build_entry(
                for ( i = 0; !BER_BVISNULL( &attr->a_vals[i] ); i++ ) ;
                last = i;
 
+               /*
+                * check that each value is valid per syntax
+                * and pretty if appropriate
+                */
                for ( i = 0; i<last; i++ ) {
                        struct berval   pval;
                        int             rc;
@@ -762,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;
@@ -782,10 +788,6 @@ ldap_build_entry(
                        for ( i = 0; i < last; i++ ) {
                                int             rc;
 
-                               /*
-                                * check that each value is valid per syntax
-                                * and pretty if appropriate
-                                */
                                rc = attr->a_desc->ad_type->sat_equality->smr_normalize(
                                        SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
                                        attr->a_desc->ad_type->sat_syntax,
@@ -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] );
@@ -814,6 +817,31 @@ ldap_build_entry(
                }
 
                attr->a_numvals = last;
+
+               /* Handle sorted vals, strip dups but keep the attr */
+               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 )
+                                       break;
+
+                               /* Strip duplicate values */
+                               if ( attr->a_nvals != attr->a_vals )
+                                       LBER_FREE( attr->a_nvals[i].bv_val );
+                               LBER_FREE( attr->a_vals[i].bv_val );
+                               attr->a_numvals--;
+                               if ( i < attr->a_numvals ) {
+                                       attr->a_vals[i] = attr->a_vals[attr->a_numvals];
+                                       if ( attr->a_nvals != attr->a_vals )
+                                               attr->a_nvals[i] = attr->a_nvals[attr->a_numvals];
+                               }
+                               BER_BVZERO(&attr->a_vals[attr->a_numvals]);
+                               if ( attr->a_nvals != attr->a_vals )
+                                       BER_BVZERO(&attr->a_vals[attr->a_numvals]);
+                       }
+                       attr->a_flags |= SLAP_ATTR_SORTED_VALS;
+               }
+
                *attrp = attr;
                attrp = &attr->a_next;