X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmra.c;h=1e7a7e63782af0f8d48e586741c2a0938147aa81;hb=b94d5e17e22b58b990dac4d4af5319be915366a6;hp=fbd3a6afa9bc4d57712946bb844b968238c04c23;hpb=c4f74ac6395e6ec6c865c47b4e3fc56432e246e6;p=openldap
diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index fbd3a6afa9..1e7a7e6378 100644
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -1,9 +1,18 @@
+/* mra.c - routines for dealing with extensible matching rule assertions */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * 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
+ * .
*/
-/* mra.c - routines for dealing with extensible matching rule assertions */
#include "portable.h"
@@ -16,39 +25,33 @@
void
mra_free(
+ Operation *op,
MatchingRuleAssertion *mra,
- int freeit
-)
+ int freeit )
{
+ /* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */
ch_free( mra->ma_value.bv_val );
- if ( freeit ) {
- ch_free( (char *) mra );
- }
+ if ( freeit ) op->o_tmpfree( (char *) mra, op->o_tmpmemctx );
}
int
get_mra(
+ Operation *op,
BerElement *ber,
MatchingRuleAssertion **mra,
- const char **text
-)
+ const char **text )
{
int rc;
ber_tag_t tag, rtag;
ber_len_t length;
- struct berval type = { 0, NULL }, value;
- MatchingRuleAssertion *ma;
+ struct berval type = BER_BVNULL;
+ struct berval value = BER_BVNULL;
+ struct berval rule_text = BER_BVNULL;
+ MatchingRuleAssertion ma;
- ma = ch_malloc( sizeof( MatchingRuleAssertion ) );
- ma->ma_rule = NULL;
- ma->ma_rule_text.bv_len = 0;
- ma->ma_rule_text.bv_val = NULL;
- ma->ma_desc = NULL;
- ma->ma_dnattrs = 0;
- ma->ma_value.bv_len = 0;
- ma->ma_value.bv_val = NULL;
+ memset( &ma, 0, sizeof ma);
- rtag = ber_scanf( ber, "{t", &tag );
+ rtag = ber_scanf( ber, "{t" /*"}"*/, &tag );
if( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
@@ -59,12 +62,11 @@ get_mra(
#endif
*text = "Error parsing matching rule assertion";
- mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
if ( tag == LDAP_FILTER_EXT_OID ) {
- rtag = ber_scanf( ber, "m", &ma->ma_rule_text );
+ rtag = ber_scanf( ber, "m", &rule_text );
if ( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
@@ -74,7 +76,6 @@ get_mra(
#endif
*text = "Error parsing matching rule in matching rule assertion";
- mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
@@ -88,7 +89,6 @@ get_mra(
#endif
*text = "Error parsing matching rule assertion";
- mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
}
@@ -117,7 +117,6 @@ get_mra(
#endif
*text = "Error parsing matching rule assertion";
- mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
}
@@ -131,7 +130,6 @@ get_mra(
#endif
*text = "Missing value in matching rule assertion";
- mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
@@ -146,16 +144,15 @@ get_mra(
#endif
*text = "Error decoding value in matching rule assertion";
- mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
tag = ber_peek_tag( ber, &length );
if ( tag == LDAP_FILTER_EXT_DNATTRS ) {
- rtag = ber_scanf( ber, "b}", &ma->ma_dnattrs );
+ rtag = ber_scanf( ber, /*"{"*/ "b}", &ma.ma_dnattrs );
} else {
- rtag = ber_scanf( ber, "}" );
+ rtag = ber_scanf( ber, /*"{"*/ "}" );
}
if( rtag == LBER_ERROR ) {
@@ -166,130 +163,77 @@ get_mra(
#endif
*text = "Error decoding dnattrs matching rule assertion";
- mra_free( ma, 1 );
return SLAPD_DISCONNECT;
}
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
- /*
- * Let's try to implement it
- */
- if( ma->ma_dnattrs ) {
- *text = "matching with \":dn\" not supported";
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-#endif /* !SLAP_X_MRA_MATCH_DNATTRS */
-
if( type.bv_val != NULL ) {
- rc = slap_bv2ad( &type, &ma->ma_desc, text );
+ rc = slap_bv2ad( &type, &ma.ma_desc, text );
if( rc != LDAP_SUCCESS ) {
- mra_free( ma, 1 );
return rc;
}
-
-#ifndef SLAP_X_MRA_MATCH_DNATTRS
- } else {
- *text = "matching without attribute description rule not supported";
- return LDAP_INAPPROPRIATE_MATCHING;
-#endif /* !SLAP_X_MRA_MATCH_DNATTRS */
}
- if( ma->ma_rule_text.bv_val != NULL ) {
- ma->ma_rule = mr_bvfind( &ma->ma_rule_text );
- if( ma->ma_rule == NULL ) {
- mra_free( ma, 1 );
+ if( rule_text.bv_val != NULL ) {
+ ma.ma_rule = mr_bvfind( &rule_text );
+ if( ma.ma_rule == NULL ) {
*text = "matching rule not recognized";
return LDAP_INAPPROPRIATE_MATCHING;
}
}
- /*
- * FIXME: is it correct that ma->ma_rule_text, if present,
- * is looked-up, checked, and then replaced by the sat_equality
- * of the given attribute? I'd rather do smtg like use
- * the attribute's equality rule only if no matching rule
- * was given, otherwise I don't see any extension ...
- */
-
-#if 1
- if ( ma->ma_rule == NULL ) {
-#ifdef SLAP_X_MRA_MATCH_DNATTRS
+ if ( ma.ma_rule == NULL ) {
/*
* Need either type or rule ...
*/
- if ( ma->ma_desc == NULL ) {
- mra_free( ma, 1 );
- *text = "matching rule not recognized";
+ if ( ma.ma_desc == NULL ) {
+ *text = "no matching rule or type";
return LDAP_INAPPROPRIATE_MATCHING;
}
-#endif /* !SLAP_X_MRA_MATCH_DNATTRS */
- if ( ma->ma_desc->ad_type->sat_equality != NULL &&
- ma->ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
+ if ( ma.ma_desc->ad_type->sat_equality != NULL &&
+ ma.ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
{
/* no matching rule was provided, use the attribute's
equality rule if it supports extensible matching. */
- ma->ma_rule = ma->ma_desc->ad_type->sat_equality;
+ ma.ma_rule = ma.ma_desc->ad_type->sat_equality;
} else {
- mra_free( ma, 1 );
+ *text = "no appropriate rule to use for type";
return LDAP_INAPPROPRIATE_MATCHING;
}
}
-#else
- if( ma->ma_desc != NULL &&
- ma->ma_desc->ad_type->sat_equality != NULL &&
- ma->ma_desc->ad_type->sat_equality->smr_usage & SLAP_MR_EXT )
- {
- /* no matching rule was provided, use the attribute's
- equality rule if it supports extensible matching. */
- ma->ma_rule = ma->ma_desc->ad_type->sat_equality;
-
- } else {
- mra_free( ma, 1 );
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-#endif
-#ifdef SLAP_X_MRA_MATCH_DNATTRS
- if ( ma->ma_desc != NULL ) {
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
- /* check to see if the matching rule is appropriate for
- the syntax of the attribute. This check will need
- to be extended to support other kinds of extensible
- matching rules */
- if( strcmp( ma->ma_rule->smr_syntax->ssyn_oid,
- ma->ma_desc->ad_type->sat_syntax->ssyn_oid ) != 0 )
- {
- mra_free( ma, 1 );
+ if ( ma.ma_desc != NULL ) {
+ if( !mr_usable_with_at( ma.ma_rule, ma.ma_desc->ad_type ) ) {
+ *text = "matching rule use with this attribute not appropriate";
return LDAP_INAPPROPRIATE_MATCHING;
}
- /*
- * OK, if no matching rule, normalize for equality, otherwise
- * normalize for the matching rule.
- */
- rc = value_validate_normalize( ma->ma_desc, SLAP_MR_EQUALITY,
- &value, &ma->ma_value, text );
-#ifdef SLAP_X_MRA_MATCH_DNATTRS
- } else {
- /*
- * Need to normalize, but how?
- */
- rc = value_validate( ma->ma_rule, &value, text );
- if ( rc == LDAP_SUCCESS ) {
- ber_dupbv( &ma->ma_value, &value );
- }
-
}
-#endif /* SLAP_X_MRA_MATCH_DNATTRS */
+
+ /*
+ * Normalize per matching rule
+ */
+ rc = asserted_value_validate_normalize( ma.ma_desc,
+ ma.ma_rule,
+ SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
+ &value, &ma.ma_value, text, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
- mra_free( ma, 1 );
return rc;
}
- *mra = ma;
+ length = sizeof(ma);
+ /* Append rule_text to end of struct */
+ if (rule_text.bv_val) length += rule_text.bv_len + 1;
+ *mra = op->o_tmpalloc( length, op->o_tmpmemctx );
+ **mra = ma;
+ if (rule_text.bv_val) {
+ (*mra)->ma_rule_text.bv_len = rule_text.bv_len;
+ (*mra)->ma_rule_text.bv_val = (char *)(*mra+1);
+ AC_MEMCPY((*mra)->ma_rule_text.bv_val, rule_text.bv_val,
+ rule_text.bv_len+1);
+ }
+
return LDAP_SUCCESS;
}
-