handle ordered values as appropriate (ITS#6516)

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 4bb3efbc1137f6884fdee8868ba1d5a0b11aae72..302fe56d1efab660192020f14c3ba789e05471dd 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -744,12 +744,12 @@ ldap_build_entry(
                        int             rc;
 
                        if ( pretty ) {
-                               rc = pretty( attr->a_desc->ad_type->sat_syntax,
+                               rc = ordered_value_pretty( attr->a_desc,
                                        &attr->a_vals[i], &pval, NULL );
 
                        } else {
-                               rc = validate( attr->a_desc->ad_type->sat_syntax,
-                                       &attr->a_vals[i] );
+                               rc = ordered_value_validate( attr->a_desc,
+                                       &attr->a_vals[i], 0 );
                        }
 
                        if ( rc != LDAP_SUCCESS ) {
@@ -793,9 +793,9 @@ ldap_build_entry(
                        for ( i = 0; i < last; i++ ) {
                                int             rc;
 
-                               rc = attr->a_desc->ad_type->sat_equality->smr_normalize(
+                               rc = ordered_value_normalize(
                                        SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                                       attr->a_desc->ad_type->sat_syntax,
+                                       attr->a_desc,
                                        attr->a_desc->ad_type->sat_equality,
                                        &attr->a_vals[i], &attr->a_nvals[i],
                                        NULL );

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index c729ea29227f24302e4e5b41b55524c124e6b9a1..e4ba48359a58bab9e3de8cb55a8def2b1b82debe 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -2045,12 +2045,12 @@ remove_oc:;
                                int             rc;
 
                                if ( pretty ) {
-                                       rc = pretty( attr->a_desc->ad_type->sat_syntax,
+                                       rc = ordered_value_pretty( attr->a_desc,
                                                &attr->a_vals[i], &pval, NULL );
 
                                } else {
-                                       rc = validate( attr->a_desc->ad_type->sat_syntax,
-                                               &attr->a_vals[i] );
+                                       rc = ordered_value_validate( attr->a_desc,
+                                               &attr->a_vals[i], 0 );
                                }
 
                                if ( rc ) {
@@ -2085,9 +2085,9 @@ remove_oc:;
                        attr->a_nvals = ch_malloc( ( last + 1 ) * sizeof( struct berval ) );
                        for ( i = 0; i<last; i++ ) {
                                /* if normalizer fails, drop this value */
-                               if ( attr->a_desc->ad_type->sat_equality->smr_normalize(
+                               if ( ordered_value_normalize(
                                        SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                                       attr->a_desc->ad_type->sat_syntax,
+                                       attr->a_desc,
                                        attr->a_desc->ad_type->sat_equality,
                                        &attr->a_vals[i], &attr->a_nvals[i],
                                        NULL )) {