X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmra.c;h=54dde3964ee2b4e8bc5527705727094148ac450c;hb=21be582df7e13ae2c8d44e1f7f02478eb9ec0762;hp=ce4a86def0bee0321f33e761f105771f047fa03b;hpb=ece7452b05fcbbb14823e113b683365a59f81f05;p=openldap
diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index ce4a86def0..54dde3964e 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-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2006 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"
@@ -14,18 +23,25 @@
#include "slap.h"
+#ifdef LDAP_COMP_MATCH
+#include "component.h"
+#endif
+
void
mra_free(
Operation *op,
MatchingRuleAssertion *mra,
- int freeit
-)
+ int freeit )
{
+#ifdef LDAP_COMP_MATCH
+ /* free component assertion */
+ if ( mra->ma_rule->smr_usage & SLAP_MR_COMPONENT && mra->ma_cf ) {
+ component_free( mra->ma_cf );
+ }
+#endif
/* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */
ch_free( mra->ma_value.bv_val );
- if ( freeit ) {
- op->o_tmpfree( (char *) mra, op->o_tmpmemctx );
- }
+ if ( freeit ) op->o_tmpfree( (char *) mra, op->o_tmpmemctx );
}
int
@@ -33,28 +49,23 @@ 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 };
- struct berval value = { 0, NULL };
- struct berval rule_text = { 0, NULL };
- MatchingRuleAssertion ma;
-
- memset( &ma, 0, sizeof ma);
+ struct berval type = BER_BVNULL;
+ struct berval value = BER_BVNULL;
+ struct berval rule_text = BER_BVNULL;
+ MatchingRuleAssertion ma = { 0 };
+#ifdef LDAP_COMP_MATCH
+ AttributeAliasing* aa = NULL;
+#endif
rtag = ber_scanf( ber, "{t" /*"}"*/, &tag );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"{t\") failure\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule assertion";
return SLAPD_DISCONNECT;
@@ -63,12 +74,7 @@ get_mra(
if ( tag == LDAP_FILTER_EXT_OID ) {
rtag = ber_scanf( ber, "m", &rule_text );
if ( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf(\"o\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf for mr\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule in matching rule assertion";
return SLAPD_DISCONNECT;
@@ -76,12 +82,7 @@ get_mra(
rtag = ber_scanf( ber, "t", &tag );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"t\") failure\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule assertion";
return SLAPD_DISCONNECT;
@@ -91,12 +92,7 @@ get_mra(
if ( tag == LDAP_FILTER_EXT_TYPE ) {
rtag = ber_scanf( ber, "m", &type );
if ( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"o\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf for ad\n", 0, 0, 0 );
-#endif
*text = "Error parsing attribute description in matching rule assertion";
return SLAPD_DISCONNECT;
@@ -104,12 +100,7 @@ get_mra(
rtag = ber_scanf( ber, "t", &tag );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"t\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule assertion";
return SLAPD_DISCONNECT;
@@ -117,12 +108,7 @@ get_mra(
}
if ( tag != LDAP_FILTER_EXT_VALUE ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf missing value\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf missing value\n", 0, 0, 0 );
-#endif
*text = "Missing value in matching rule assertion";
return SLAPD_DISCONNECT;
@@ -131,12 +117,7 @@ get_mra(
rtag = ber_scanf( ber, "m", &value );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"o\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error decoding value in matching rule assertion";
return SLAPD_DISCONNECT;
@@ -151,11 +132,7 @@ get_mra(
}
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR, "get_mra: ber_scanf failure\n", 0, 0, 0);
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error decoding dnattrs matching rule assertion";
return SLAPD_DISCONNECT;
@@ -164,7 +141,12 @@ get_mra(
if( type.bv_val != NULL ) {
rc = slap_bv2ad( &type, &ma.ma_desc, text );
if( rc != LDAP_SUCCESS ) {
- return rc;
+ rc = slap_bv2undef_ad( &type, &ma.ma_desc, text,
+ SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
+
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
}
}
@@ -214,9 +196,20 @@ get_mra(
SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
&value, &ma.ma_value, text, op->o_tmpmemctx );
- if( rc != LDAP_SUCCESS ) {
- return rc;
+ if( rc != LDAP_SUCCESS ) return rc;
+
+#ifdef LDAP_COMP_MATCH
+ /* Check If this attribute is aliased */
+ if ( is_aliased_attribute && ma.ma_desc && ( aa = is_aliased_attribute ( ma.ma_desc ) ) ) {
+ rc = get_aliased_filter ( op, &ma, aa, text );
+ if ( rc != LDAP_SUCCESS ) return rc;
}
+ else if ( ma.ma_rule && ma.ma_rule->smr_usage & SLAP_MR_COMPONENT ) {
+ /* Matching Rule for Component Matching */
+ rc = get_comp_filter( op, &ma.ma_value, &ma.ma_cf, text );
+ if ( rc != LDAP_SUCCESS ) return rc;
+ }
+#endif
length = sizeof(ma);
/* Append rule_text to end of struct */