From a26cca88ddf591e00ea7287e288fcbf56e08582b Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 24 Mar 2003 22:23:18 +0000 Subject: [PATCH] blind fix of value_match when SLAP_NVALUES is set --- servers/slapd/slapi/slapi_utils.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c index 6dc94495a2..5d2daf0fea 100644 --- a/servers/slapd/slapi/slapi_utils.c +++ b/servers/slapd/slapi/slapi_utils.c @@ -2435,8 +2435,14 @@ int slapi_attr_value_cmp( const Slapi_Attr *a, const struct berval *v1, const st const char *text; mr = a->a_desc->ad_type->sat_equality; +#ifdef SLAP_NVALUES + rc = value_match( &ret, a->a_desc, mr, + SLAP_MR_VALUE_OF_ASSERTION_SYNTAX, + (struct berval *)v1, (void *)v2, &text ); +#else rc = value_match( &ret, a->a_desc, mr, SLAP_MR_ASSERTION_SYNTAX_MATCH, (struct berval *)v1, (void *)v2, &text ); +#endif if ( rc != LDAP_SUCCESS ) return -1; @@ -2458,8 +2464,13 @@ int slapi_attr_value_find( const Slapi_Attr *a, struct berval *v ) mr = a->a_desc->ad_type->sat_equality; for ( bv = a->a_vals, j = 0; bv->bv_val != NULL; bv++, j++ ) { +#ifdef SLAP_NVALUES + rc = value_match( &ret, a->a_desc, mr, + SLAP_MR_VALUE_OF_ASSERTION_SYNTAX, bv, v, &text ); +#else rc = value_match( &ret, a->a_desc, mr, SLAP_MR_ASSERTION_SYNTAX_MATCH, bv, v, &text ); +#endif if ( rc != LDAP_SUCCESS ) { return -1; } -- 2.39.5