X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmr.c;h=639f594fe4872fcc62df2fb98a0e0d772bd7991d;hb=6d1aa51604a7ae9c44287af5201afc9f43b5e91e;hp=e810c3764871f5eb85c89f645245cc279ad9a332;hpb=761f2879435deec0dc8369de98381557de416b89;p=openldap

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index e810c37648..639f594fe4 100644
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,9 @@ struct mindexrec {
 };
 
 static Avlnode	*mr_index = NULL;
-static LDAP_SLIST_HEAD(MRList, slap_matching_rule) mr_list
+static LDAP_SLIST_HEAD(MRList, MatchingRule) mr_list
 	= LDAP_SLIST_HEAD_INITIALIZER(&mr_list);
-static LDAP_SLIST_HEAD(MRUList, slap_matching_rule_use) mru_list
+static LDAP_SLIST_HEAD(MRUList, MatchingRuleUse) mru_list
 	= LDAP_SLIST_HEAD_INITIALIZER(&mru_list);
 
 static int
@@ -145,6 +145,67 @@ mr_insert(
 	return 0;
 }
 
+int
+mr_make_syntax_compat_with_mr(
+	Syntax		*syn,
+	MatchingRule	*mr )
+{
+	int		n = 0;
+
+	assert( syn != NULL );
+	assert( mr != NULL );
+
+	if ( mr->smr_compat_syntaxes ) {
+		/* count esisting */
+		for ( n = 0;
+			mr->smr_compat_syntaxes[ n ];
+			n++ )
+		{
+			if ( mr->smr_compat_syntaxes[ n ] == syn ) {
+				/* already compatible; mmmmh... */
+				return 1;
+			}
+		}
+	}
+
+	mr->smr_compat_syntaxes = ch_realloc(
+		mr->smr_compat_syntaxes,
+		sizeof( Syntax * )*(n + 2) );
+	mr->smr_compat_syntaxes[ n ] = syn;
+	mr->smr_compat_syntaxes[ n + 1 ] = NULL;
+
+	return 0;
+}
+
+int
+mr_make_syntax_compat_with_mrs(
+	const char *syntax,
+	char *const *mrs )
+{
+	int	r, rc = 0;
+	Syntax	*syn;
+
+	assert( syntax != NULL );
+	assert( mrs != NULL );
+
+	syn = syn_find( syntax );
+	if ( syn == NULL ) {
+		return -1;
+	}
+
+	for ( r = 0; mrs[ r ] != NULL; r++ ) {
+		MatchingRule	*mr = mr_find( mrs[ r ] );
+		if ( mr == NULL ) {
+			/* matchingRule not found -- ignore by now */
+			continue;
+		}
+
+		rc += mr_make_syntax_compat_with_mr( syn, mr );
+	}
+
+	return rc;
+}
+
 int
 mr_add(
     LDAPMatchingRule		*mr,
@@ -169,6 +230,7 @@ mr_add(
 		for( i=0; def->mrd_compat_syntaxes[i]; i++ ) {
 			compat_syn[i] = syn_find( def->mrd_compat_syntaxes[i] );
 			if( compat_syn[i] == NULL ) {
+				ch_free( compat_syn );
 				return SLAP_SCHERR_SYN_NOT_FOUND;
 			}
 		}
@@ -198,10 +260,12 @@ mr_add(
 			smr->smr_syntax = syn;
 		} else {
 			*err = smr->smr_syntax_oid;
+			ch_free( smr );
 			return SLAP_SCHERR_SYN_NOT_FOUND;
 		}
 	} else {
 		*err = "";
+		ch_free( smr );
 		return SLAP_SCHERR_MR_INCOMPLETE;
 	}
 	code = mr_insert(smr,err);
@@ -217,9 +281,7 @@ register_matching_rule(
 	int		code;
 	const char	*err;
 
-	if( def->mrd_usage == SLAP_MR_NONE &&
-		def->mrd_compat_syntaxes == NULL )
-	{
+	if( def->mrd_usage == SLAP_MR_NONE && def->mrd_compat_syntaxes == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "register_matching_rule: not usable %s\n",
 		    def->mrd_desc, 0, 0 );
 
@@ -228,10 +290,9 @@ register_matching_rule(
 
 	if( def->mrd_associated != NULL ) {
 		amr = mr_find( def->mrd_associated );
-
 		if( amr == NULL ) {
-			Debug( LDAP_DEBUG_ANY, "register_matching_rule: could not locate "
-				"associated matching rule %s for %s\n",
+			Debug( LDAP_DEBUG_ANY, "register_matching_rule: "
+				"could not locate associated matching rule %s for %s\n",
 				def->mrd_associated, def->mrd_desc, 0 );
 
 			return -1;
@@ -243,17 +304,15 @@ register_matching_rule(
 			if (( def->mrd_usage & SLAP_MR_EQUALITY ) &&
 				(( def->mrd_usage & SLAP_MR_SUBTYPE_MASK ) != SLAP_MR_NONE ))
 			{
-				Debug( LDAP_DEBUG_ANY,
-				   "register_matching_rule: inappropriate (approx) association "
-						"%s for %s\n",
+				Debug( LDAP_DEBUG_ANY, "register_matching_rule: "
+						"inappropriate (approx) association %s for %s\n",
 					def->mrd_associated, def->mrd_desc, 0 );
 				return -1;
 			}
 
 		} else if (!( amr->smr_usage & SLAP_MR_EQUALITY )) {
-				Debug( LDAP_DEBUG_ANY,
-				   "register_matching_rule: inappropriate (equalilty) association "
-						"%s for %s\n",
+				Debug( LDAP_DEBUG_ANY, "register_matching_rule: "
+					"inappropriate (equalilty) association %s for %s\n",
 					def->mrd_associated, def->mrd_desc, 0 );
 				return -1;
 		}
@@ -318,7 +377,8 @@ matching_rule_use_init( void )
 
 	LDAP_SLIST_FOREACH( mr, &mr_list, smr_next ) {
 		AttributeType	*at;
-		MatchingRuleUse	mru_storage, *mru = &mru_storage;
+		MatchingRuleUse	mru_storage = {{ 0 }},
+				*mru = &mru_storage;
 
 		char		**applies_oids = NULL;
 
@@ -343,8 +403,6 @@ matching_rule_use_init( void )
 			continue;
 		}
 
-		memset( mru, 0, sizeof( MatchingRuleUse ) );
-
 		/*
 		 * Note: we're using the same values of the corresponding 
 		 * MatchingRule structure; maybe we'd copy them ...
@@ -398,13 +456,16 @@ matching_rule_use_init( void )
 	return( 0 );
 }
 
-int mr_usable_with_at(
-	MatchingRule *mr,
-	AttributeType *at )
+int
+mr_usable_with_at(
+	MatchingRule	*mr,
+	AttributeType	*at )
 {
-	if( mr->smr_usage & SLAP_MR_EXT && ( 
+	if ( ( mr->smr_usage & SLAP_MR_EXT ) && (
 		mr->smr_syntax == at->sat_syntax ||
-		mr == at->sat_equality || mr == at->sat_approx ) )
+		mr == at->sat_equality ||
+		mr == at->sat_approx ||
+		syn_is_sup( at->sat_syntax, mr->smr_syntax ) ) )
 	{
 		return 1;
 	}