X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmr.c;h=32165263fb475015a3e94d21cbc5030e6ce99524;hb=a4d161cff64c74e03e5898eae104d5d52cc54a91;hp=069b72b370f685df24595810b1df211e6440d566;hpb=f5e6d1db410c11b26dfe5ef2e5563f51e136c830;p=openldap
diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 069b72b370..32165263fb 100644
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -1,8 +1,17 @@
/* mr.c - routines to manage matching rule definitions */
/* $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-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
+ * .
*/
#include "portable.h"
@@ -14,7 +23,6 @@
#include
#include "slap.h"
-#include "ldap_pvt.h"
struct mindexrec {
struct berval mir_name;
@@ -22,29 +30,35 @@ struct mindexrec {
};
static Avlnode *mr_index = NULL;
-static MatchingRule *mr_list = NULL;
-static MatchingRuleUse *mru_list = NULL;
+static LDAP_SLIST_HEAD(MRList, slap_matching_rule) mr_list
+ = LDAP_SLIST_HEAD_INITIALIZER(&mr_list);
+static LDAP_SLIST_HEAD(MRUList, slap_matching_rule_use) mru_list
+ = LDAP_SLIST_HEAD_INITIALIZER(&mru_list);
static int
mr_index_cmp(
- struct mindexrec *mir1,
- struct mindexrec *mir2
+ const void *v_mir1,
+ const void *v_mir2
)
{
+ const struct mindexrec *mir1 = v_mir1;
+ const struct mindexrec *mir2 = v_mir2;
int i = mir1->mir_name.bv_len - mir2->mir_name.bv_len;
if (i) return i;
- return (strcmp( mir1->mir_name.bv_val, mir2->mir_name.bv_val ));
+ return (strcasecmp( mir1->mir_name.bv_val, mir2->mir_name.bv_val ));
}
static int
mr_index_name_cmp(
- struct berval *name,
- struct mindexrec *mir
+ const void *v_name,
+ const void *v_mir
)
{
+ const struct berval *name = v_name;
+ const struct mindexrec *mir = v_mir;
int i = name->bv_len - mir->mir_name.bv_len;
if (i) return i;
- return (strncmp( name->bv_val, mir->mir_name.bv_val, name->bv_len ));
+ return (strncasecmp( name->bv_val, mir->mir_name.bv_val, name->bv_len ));
}
MatchingRule *
@@ -62,8 +76,7 @@ mr_bvfind( struct berval *mrname )
{
struct mindexrec *mir = NULL;
- if ( (mir = (struct mindexrec *) avl_find( mr_index, mrname,
- (AVL_CMP) mr_index_name_cmp )) != NULL ) {
+ if ( (mir = avl_find( mr_index, mrname, mr_index_name_cmp )) != NULL ) {
return( mir->mir_mr );
}
return( NULL );
@@ -72,12 +85,14 @@ mr_bvfind( struct berval *mrname )
void
mr_destroy( void )
{
- MatchingRule *m, *n;
+ MatchingRule *m;
avl_free(mr_index, ldap_memfree);
- for (m=mr_list; m; m=n) {
- n = m->smr_next;
+ while( !LDAP_SLIST_EMPTY(&mr_list) ) {
+ m = LDAP_SLIST_FIRST(&mr_list);
+ LDAP_SLIST_REMOVE_HEAD(&mr_list, smr_next);
ch_free( m->smr_str.bv_val );
+ ch_free( m->smr_compat_syntaxes );
ldap_matchingrule_free((LDAPMatchingRule *)m);
}
}
@@ -88,15 +103,11 @@ mr_insert(
const char **err
)
{
- MatchingRule **mrp;
struct mindexrec *mir;
char **names;
- mrp = &mr_list;
- while ( *mrp != NULL ) {
- mrp = &(*mrp)->smr_next;
- }
- *mrp = smr;
+ LDAP_SLIST_NEXT( smr, smr_next ) = NULL;
+ LDAP_SLIST_INSERT_HEAD(&mr_list, smr, smr_next);
if ( smr->smr_oid ) {
mir = (struct mindexrec *)
@@ -105,8 +116,7 @@ mr_insert(
mir->mir_name.bv_len = strlen( smr->smr_oid );
mir->mir_mr = smr;
if ( avl_insert( &mr_index, (caddr_t) mir,
- (AVL_CMP) mr_index_cmp,
- (AVL_DUP) avl_dup_error ) ) {
+ mr_index_cmp, avl_dup_error ) ) {
*err = smr->smr_oid;
ldap_memfree(mir);
return SLAP_SCHERR_MR_DUP;
@@ -122,8 +132,7 @@ mr_insert(
mir->mir_name.bv_len = strlen( *names );
mir->mir_mr = smr;
if ( avl_insert( &mr_index, (caddr_t) mir,
- (AVL_CMP) mr_index_cmp,
- (AVL_DUP) avl_dup_error ) ) {
+ mr_index_cmp, avl_dup_error ) ) {
*err = *names;
ldap_memfree(mir);
return SLAP_SCHERR_MR_DUP;
@@ -178,7 +187,6 @@ mr_add(
smr->smr_oidlen = strlen( mr->mr_oid );
smr->smr_usage = def->mrd_usage;
smr->smr_compat_syntaxes = compat_syn;
- smr->smr_convert = def->mrd_convert;
smr->smr_normalize = def->mrd_normalize;
smr->smr_match = def->mrd_match;
smr->smr_indexer = def->mrd_indexer;
@@ -209,97 +217,88 @@ register_matching_rule(
int code;
const char *err;
- if( def->mrd_usage == SLAP_MR_NONE &&
- def->mrd_compat_syntaxes == NULL )
- {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "register_matching_rule: %s not usable\n", def->mrd_desc, 0, 0 );
-#else
+ 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 );
-#endif
return -1;
}
if( def->mrd_associated != NULL ) {
amr = mr_find( def->mrd_associated );
-
-#if 0
- /* ignore for now */
-
if( amr == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "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 );
-#else
- Debug( LDAP_DEBUG_ANY, "register_matching_rule: could not locate "
- "associated matching rule %s for %s\n",
- def->mrd_associated, def->mrd_desc, 0 );
-#endif
return -1;
}
-#endif
+
+ if (( def->mrd_usage & SLAP_MR_EQUALITY ) &&
+ (( def->mrd_usage & SLAP_MR_SUBTYPE_MASK ) == SLAP_MR_NONE ))
+ {
+ 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",
+ 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",
+ def->mrd_associated, def->mrd_desc, 0 );
+ return -1;
+ }
}
mr = ldap_str2matchingrule( def->mrd_desc, &code, &err,
LDAP_SCHEMA_ALLOW_ALL );
if ( !mr ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "register_matching_rule: %s before %s in %s.\n",
- ldap_scherr2str(code), err, def->mrd_desc );
-#else
Debug( LDAP_DEBUG_ANY,
"Error in register_matching_rule: %s before %s in %s\n",
ldap_scherr2str(code), err, def->mrd_desc );
-#endif
- return( -1 );
+ return -1;
}
+
code = mr_add( mr, def, amr, &err );
ldap_memfree( mr );
if ( code ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "register_matching_rule: %s for %s in %s.\n",
- scherr2str(code), err, def->mrd_desc );
-#else
Debug( LDAP_DEBUG_ANY,
"Error in register_matching_rule: %s for %s in %s\n",
scherr2str(code), err, def->mrd_desc );
-#endif
- return( -1 );
+ return -1;
}
- return( 0 );
+ return 0;
}
void
mru_destroy( void )
{
- MatchingRuleUse *m, *n;
+ MatchingRuleUse *m;
+
+ while( !LDAP_SLIST_EMPTY(&mru_list) ) {
+ m = LDAP_SLIST_FIRST(&mru_list);
+ LDAP_SLIST_REMOVE_HEAD(&mru_list, smru_next);
- for (m=mru_list; m; m=n) {
- n = m->smru_next;
if ( m->smru_str.bv_val ) {
ch_free( m->smru_str.bv_val );
+ m->smru_str.bv_val = NULL;
}
/* memory borrowed from m->smru_mr */
m->smru_oid = NULL;
m->smru_names = NULL;
m->smru_desc = NULL;
- /* free what's left (basically
- * smru_mruleuse.mru_applies_oids) */
+ /* free what's left (basically smru_mruleuse.mru_applies_oids) */
ldap_matchingruleuse_free((LDAPMatchingRuleUse *)m);
}
}
@@ -308,30 +307,13 @@ int
matching_rule_use_init( void )
{
MatchingRule *mr;
- MatchingRuleUse **mru_ptr = &mru_list;
-
-#define MR_TYPE_MASK ( SLAP_MR_TYPE_MASK & ~SLAP_MR_EXT )
-#define MR_TYPE_SUBTYPE_MASK ( MR_TYPE_MASK | SLAP_MR_SUBTYPE_MASK )
-#if 0 /* all types regardless of EXT */
-#define MR_TYPE(x) ( (x) & MR_TYPE_MASK )
-#define MR_TYPE_SUBTYPE(x) ( (x) & MR_TYPE_SUBTYPE_MASK )
-#else /* only those marked as EXT (as per RFC 2252) */
-#define MR_TYPE(x) ( ( (x) & SLAP_MR_EXT ) ? ( (x) & MR_TYPE_MASK ) : SLAP_MR_NONE )
-#define MR_TYPE_SUBTYPE(x) ( ( (x) & SLAP_MR_EXT ) ? ( (x) & MR_TYPE_SUBTYPE_MASK ) : SLAP_MR_NONE )
-#endif
+ MatchingRuleUse **mru_ptr = &LDAP_SLIST_FIRST(&mru_list);
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO, "matching_rule_use_init\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "matching_rule_use_init\n", 0, 0, 0 );
-#endif
-
- for ( mr = mr_list; mr; mr = mr->smr_next ) {
- slap_mask_t um = MR_TYPE( mr->smr_usage );
- slap_mask_t usm = MR_TYPE_SUBTYPE( mr->smr_usage );
+ LDAP_SLIST_FOREACH( mr, &mr_list, smr_next ) {
AttributeType *at;
- MatchingRuleUse _mru, *mru = &_mru;
+ MatchingRuleUse mru_storage, *mru = &mru_storage;
char **applies_oids = NULL;
@@ -365,20 +347,14 @@ matching_rule_use_init( void )
mru->smru_mr = mr;
mru->smru_obsolete = mr->smr_obsolete;
mru->smru_applies_oids = NULL;
- mru->smru_next = NULL;
+ LDAP_SLIST_NEXT(mru, smru_next) = NULL;
mru->smru_oid = mr->smr_oid;
mru->smru_names = mr->smr_names;
mru->smru_desc = mr->smr_desc;
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, INFO, " %s (%s): ",
- mru->smru_oid,
- mru->smru_names ? mru->smru_names[ 0 ] : "", 0 );
-#else
Debug( LDAP_DEBUG_TRACE, " %s (%s): ",
mru->smru_oid,
mru->smru_names ? mru->smru_names[ 0 ] : "", 0 );
-#endif
at = NULL;
for ( at_start( &at ); at; at_next( &at ) ) {
@@ -396,29 +372,21 @@ matching_rule_use_init( void )
*/
if ( applies_oids != NULL ) {
mru->smru_applies_oids = applies_oids;
-#ifdef NEW_LOGGING
- {
- char *str = ldap_matchingruleuse2str( &mru->smru_mruleuse );
- LDAP_LOG( OPERATION, INFO, "matchingRuleUse: %s\n", str, 0, 0 );
- ldap_memfree( str );
- }
-#else
{
char *str = ldap_matchingruleuse2str( &mru->smru_mruleuse );
Debug( LDAP_DEBUG_TRACE, "matchingRuleUse: %s\n", str, 0, 0 );
ldap_memfree( str );
}
-#endif
mru = (MatchingRuleUse *)ber_memalloc( sizeof( MatchingRuleUse ) );
/* call-forward from MatchingRule to MatchingRuleUse */
mr->smr_mru = mru;
/* copy static data to newly allocated struct */
- *mru = _mru;
+ *mru = mru_storage;
/* append the struct pointer to the end of the list */
*mru_ptr = mru;
/* update the list head pointer */
- mru_ptr = &mru->smru_next;
+ mru_ptr = &LDAP_SLIST_NEXT(mru,smru_next);
}
}
@@ -449,11 +417,11 @@ int mr_usable_with_at(
int mr_schema_info( Entry *e )
{
- MatchingRule *mr;
-
AttributeDescription *ad_matchingRules = slap_schema.si_ad_matchingRules;
+ MatchingRule *mr;
+ struct berval nval;
- for ( mr = mr_list; mr; mr = mr->smr_next ) {
+ LDAP_SLIST_FOREACH(mr, &mr_list, smr_next ) {
if ( mr->smr_usage & SLAP_MR_HIDE ) {
/* skip hidden rules */
continue;
@@ -473,20 +441,24 @@ int mr_schema_info( Entry *e )
Debug( LDAP_DEBUG_TRACE, "Merging mr [%lu] %s\n",
mr->smr_str.bv_len, mr->smr_str.bv_val, 0 );
#endif
- attr_merge_one( e, ad_matchingRules, &mr->smr_str );
+
+ nval.bv_val = mr->smr_oid;
+ nval.bv_len = strlen(mr->smr_oid);
+ if( attr_merge_one( e, ad_matchingRules, &mr->smr_str, &nval ) ) {
+ return -1;
+ }
}
return 0;
}
int mru_schema_info( Entry *e )
{
- MatchingRuleUse *mru;
-
AttributeDescription *ad_matchingRuleUse
= slap_schema.si_ad_matchingRuleUse;
+ MatchingRuleUse *mru;
+ struct berval nval;
- for ( mru = mru_list; mru; mru = mru->smru_next ) {
-
+ LDAP_SLIST_FOREACH( mru, &mru_list, smru_next ) {
assert( !( mru->smru_usage & SLAP_MR_HIDE ) );
if ( mru->smru_str.bv_val == NULL ) {
@@ -500,7 +472,12 @@ int mru_schema_info( Entry *e )
Debug( LDAP_DEBUG_TRACE, "Merging mru [%lu] %s\n",
mru->smru_str.bv_len, mru->smru_str.bv_val, 0 );
#endif
- attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str );
+
+ nval.bv_val = mru->smru_oid;
+ nval.bv_len = strlen(mru->smru_oid);
+ if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str, &nval ) ) {
+ return -1;
+ }
}
return 0;
}