X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FmatchedValues.c;h=2ef1d934e891e4b867e46a926a171c04ccd318a6;hb=8153e518462ae7e86e082543cbf451aa4e3a9ff4;hp=b92c4d1cb2072b7f2c3580674161958da16969e3;hpb=0b3f6e364ca3c1fadd2a30824ebf5381b564b457;p=openldap
diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index b92c4d1cb2..2ef1d934e8 100644
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -1,13 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1999-2003 The OpenLDAP Foundation.
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1999-2005 The OpenLDAP Foundation.
* All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License. A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
+
#include "portable.h"
#include
@@ -55,125 +60,74 @@ int
filter_matched_values(
Operation *op,
Attribute *a,
- char ***e_flags
-)
+ char ***e_flags )
{
ValuesReturnFilter *vrf;
int rc = LDAP_SUCCESS;
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY, "filter_matched_values: begin\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "=> filter_matched_values\n", 0, 0, 0 );
-#endif
for ( vrf = op->o_vrFilter; vrf != NULL; vrf = vrf->vrf_next ) {
switch ( vrf->vrf_choice ) {
case SLAPD_FILTER_COMPUTED:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1,
- "test_vrFilter: COMPUTED %s (%d)\n",
- vrf->vrf_result == LDAP_COMPARE_FALSE ? "false" :
- vrf->vrf_result == LDAP_COMPARE_TRUE ? "true" :
- vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? "undefined" :
- "error", vrf->vrf_result, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " COMPUTED %s (%d)\n",
- vrf->vrf_result == LDAP_COMPARE_FALSE ? "false" :
- vrf->vrf_result == LDAP_COMPARE_TRUE ? "true" :
- vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? "undefined" : "error",
+ vrf->vrf_result == LDAP_COMPARE_FALSE ? "false"
+ : vrf->vrf_result == LDAP_COMPARE_TRUE ? "true"
+ : vrf->vrf_result == SLAPD_COMPARE_UNDEFINED ? "undefined"
+ : "error",
vrf->vrf_result, 0 );
-#endif
/*This type of filter does not affect the result */
rc = LDAP_SUCCESS;
break;
case LDAP_FILTER_EQUALITY:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1, "test_vrFilter: EQUALITY\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " EQUALITY\n", 0, 0, 0 );
-#endif
rc = test_ava_vrFilter( op, a, vrf->vrf_ava,
LDAP_FILTER_EQUALITY, e_flags );
- if( rc == -1 ) {
- return rc;
- }
+ if( rc == -1 ) return rc;
break;
case LDAP_FILTER_SUBSTRINGS:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1, "test_vrFilter SUBSTRINGS\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " SUBSTRINGS\n", 0, 0, 0 );
-#endif
-
rc = test_substrings_vrFilter( op, a,
vrf, e_flags );
- if( rc == -1 ) {
- return rc;
- }
+ if( rc == -1 ) return rc;
break;
case LDAP_FILTER_PRESENT:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1, "test_vrFilter: PRESENT\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " PRESENT\n", 0, 0, 0 );
-#endif
rc = test_presence_vrFilter( op, a,
vrf->vrf_desc, e_flags );
- if( rc == -1 ) {
- return rc;
- }
+ if( rc == -1 ) return rc;
break;
case LDAP_FILTER_GE:
rc = test_ava_vrFilter( op, a, vrf->vrf_ava,
LDAP_FILTER_GE, e_flags );
- if( rc == -1 ) {
- return rc;
- }
+ if( rc == -1 ) return rc;
break;
case LDAP_FILTER_LE:
rc = test_ava_vrFilter( op, a, vrf->vrf_ava,
LDAP_FILTER_LE, e_flags );
- if( rc == -1 ) {
- return rc;
- }
+ if( rc == -1 ) return rc;
break;
case LDAP_FILTER_EXT:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, DETAIL1, "test_vrFilter: EXT\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, " EXT\n", 0, 0, 0 );
-#endif
rc = test_mra_vrFilter( op, a,
vrf->vrf_mra, e_flags );
- if( rc == -1 ) {
- return rc;
- }
+ if( rc == -1 ) return rc;
break;
default:
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, INFO,
- "test_vrFilter: unknown filter type %lu\n", vrf->vrf_choice, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " unknown filter type %lu\n",
vrf->vrf_choice, 0, 0 );
-#endif
rc = LDAP_PROTOCOL_ERROR;
- }
+ }
}
-#ifdef NEW_LOGGING
- LDAP_LOG( FILTER, ENTRY, "filter_matched_values: return=%d\n", rc, 0, 0 );
-#else
Debug( LDAP_DEBUG_FILTER, "<= filter_matched_values %d\n", rc, 0, 0 );
-#endif
return( rc );
}
@@ -183,13 +137,11 @@ test_ava_vrFilter(
Attribute *a,
AttributeAssertion *ava,
int type,
- char ***e_flags
-)
+ char ***e_flags )
{
int i, j;
for ( i=0; a != NULL; a = a->a_next, i++ ) {
-
MatchingRule *mr;
struct berval *bv;
@@ -201,8 +153,8 @@ test_ava_vrFilter(
case LDAP_FILTER_APPROX:
mr = a->a_desc->ad_type->sat_approx;
if( mr != NULL ) break;
+ /* use EQUALITY matching rule if no APPROX rule */
- /* use EQUALITY matching rule if no APPROX rule */
case LDAP_FILTER_EQUALITY:
mr = a->a_desc->ad_type->sat_equality;
break;
@@ -216,46 +168,40 @@ test_ava_vrFilter(
mr = NULL;
}
- if( mr == NULL ) {
- continue;
-
- }
+ if( mr == NULL ) continue;
bv = a->a_nvals;
- for ( j=0; bv->bv_val != NULL; bv++, j++ ) {
- int ret;
- int rc;
+ for ( j=0; !BER_BVISNULL( bv ); bv++, j++ ) {
+ int rc, match;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
+ rc = value_match( &match, a->a_desc, mr, 0,
bv, &ava->aa_value, &text );
- if( rc != LDAP_SUCCESS ) {
- return rc;
- }
+ if( rc != LDAP_SUCCESS ) return rc;
switch ( type ) {
case LDAP_FILTER_EQUALITY:
case LDAP_FILTER_APPROX:
- if ( ret == 0 ) {
+ if ( match == 0 ) {
(*e_flags)[i][j] = 1;
}
break;
case LDAP_FILTER_GE:
- if ( ret >= 0 ) {
+ if ( match >= 0 ) {
(*e_flags)[i][j] = 1;
}
break;
case LDAP_FILTER_LE:
- if ( ret <= 0 ) {
+ if ( match <= 0 ) {
(*e_flags)[i][j] = 1;
}
break;
}
}
}
- return( LDAP_SUCCESS );
+ return LDAP_SUCCESS;
}
static int
@@ -263,19 +209,16 @@ test_presence_vrFilter(
Operation *op,
Attribute *a,
AttributeDescription *desc,
- char ***e_flags
-)
+ char ***e_flags )
{
int i, j;
for ( i=0; a != NULL; a = a->a_next, i++ ) {
struct berval *bv;
- if ( !is_ad_subtype( a->a_desc, desc ) ) {
- continue;
- }
+ if ( !is_ad_subtype( a->a_desc, desc ) ) continue;
- for ( bv = a->a_vals, j=0; bv->bv_val != NULL; bv++, j++ );
+ for ( bv = a->a_vals, j = 0; !BER_BVISNULL( bv ); bv++, j++ );
memset( (*e_flags)[i], 1, j);
}
@@ -287,8 +230,7 @@ test_substrings_vrFilter(
Operation *op,
Attribute *a,
ValuesReturnFilter *vrf,
- char ***e_flags
-)
+ char ***e_flags )
{
int i, j;
@@ -300,24 +242,19 @@ test_substrings_vrFilter(
continue;
}
- if( mr == NULL ) {
- continue;
- }
+ if( mr == NULL ) continue;
bv = a->a_nvals;
- for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
- int ret;
- int rc;
+ for ( j = 0; !BER_BVISNULL( bv ); bv++, j++ ) {
+ int rc, match;
const char *text;
- rc = value_match( &ret, a->a_desc, mr, 0,
+ rc = value_match( &match, a->a_desc, mr, 0,
bv, vrf->vrf_sub, &text );
- if( rc != LDAP_SUCCESS ) {
- return rc;
- }
+ if( rc != LDAP_SUCCESS ) return rc;
- if ( ret == 0 ) {
+ if ( match == 0 ) {
(*e_flags)[i][j] = 1;
}
}
@@ -331,50 +268,76 @@ test_mra_vrFilter(
Operation *op,
Attribute *a,
MatchingRuleAssertion *mra,
- char ***e_flags
-)
+ char ***e_flags )
{
- int i, j;
+ int i, j;
- for ( i=0; a != NULL; a = a->a_next, i++ ) {
- struct berval *bv, value;
+ for ( i = 0; a != NULL; a = a->a_next, i++ ) {
+ struct berval *bv, assertedValue;
+ int normalize_attribute = 0;
if ( mra->ma_desc ) {
if ( !is_ad_subtype( a->a_desc, mra->ma_desc ) ) {
continue;
}
- value = mra->ma_value;
+ assertedValue = mra->ma_value;
} else {
int rc;
const char *text = NULL;
/* check if matching is appropriate */
- if ( strcmp( mra->ma_rule->smr_syntax->ssyn_oid,
- a->a_desc->ad_type->sat_syntax->ssyn_oid ) != 0 ) {
+ if ( !mr_usable_with_at( mra->ma_rule, a->a_desc->ad_type ) ) {
continue;
}
rc = asserted_value_validate_normalize( a->a_desc, mra->ma_rule,
SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
- &mra->ma_value, &value, &text, op->o_tmpmemctx );
+ &mra->ma_value, &assertedValue, &text, op->o_tmpmemctx );
- if( rc != LDAP_SUCCESS ) continue;
+ if ( rc != LDAP_SUCCESS ) continue;
}
- bv = a->a_nvals;
- for ( j = 0; bv->bv_val != NULL; bv++, j++ ) {
- int ret;
- int rc;
- const char *text;
+ /* check match */
+ if ( mra->ma_rule == a->a_desc->ad_type->sat_equality ) {
+ bv = a->a_nvals;
+
+ } else {
+ bv = a->a_vals;
+ normalize_attribute = 1;
+ }
+
+ for ( j = 0; !BER_BVISNULL( bv ); bv++, j++ ) {
+ int rc, match;
+ const char *text;
+ struct berval nbv = BER_BVNULL;
+
+ if ( normalize_attribute && mra->ma_rule->smr_normalize ) {
+ /* see comment in filterentry.c */
+ if ( mra->ma_rule->smr_normalize(
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ mra->ma_rule->smr_syntax,
+ mra->ma_rule,
+ bv, &nbv, op->o_tmpmemctx ) != LDAP_SUCCESS )
+ {
+ /* FIXME: stop processing? */
+ continue;
+ }
- rc = value_match( &ret, a->a_desc, mra->ma_rule, 0,
- bv, &value, &text );
- if( rc != LDAP_SUCCESS ) {
- return rc;
+ } else {
+ nbv = *bv;
}
- if ( ret == 0 ) {
+ rc = value_match( &match, a->a_desc, mra->ma_rule, 0,
+ &nbv, &assertedValue, &text );
+
+ if ( nbv.bv_val != bv->bv_val ) {
+ op->o_tmpfree( nbv.bv_val, op->o_tmpmemctx );
+ }
+
+ if ( rc != LDAP_SUCCESS ) return rc;
+
+ if ( match == 0 ) {
(*e_flags)[i][j] = 1;
}
}
@@ -382,3 +345,4 @@ test_mra_vrFilter(
return LDAP_SUCCESS;
}
+