X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmr.c;h=e810c3764871f5eb85c89f645245cc279ad9a332;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=a88a47b17058fe40c70797cb145d5db885b6cb43;hpb=9ccecd390792ed05d531daed2ff96801918f1c4d;p=openldap
diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index a88a47b170..e810c37648 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-2003 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
+ * .
*/
#include "portable.h"
@@ -14,7 +23,6 @@
#include
#include "slap.h"
-#include "ldap_pvt.h"
struct mindexrec {
struct berval mir_name;
@@ -37,7 +45,7 @@ mr_index_cmp(
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
@@ -50,7 +58,7 @@ mr_index_name_cmp(
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 *
@@ -181,9 +189,6 @@ mr_add(
smr->smr_compat_syntaxes = compat_syn;
smr->smr_normalize = def->mrd_normalize;
smr->smr_match = def->mrd_match;
-#ifndef SLAP_NVALUES
- smr->smr_convert = def->mrd_convert;
-#endif
smr->smr_indexer = def->mrd_indexer;
smr->smr_filter = def->mrd_filter;
smr->smr_associated = amr;
@@ -215,13 +220,8 @@ register_matching_rule(
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
Debug( LDAP_DEBUG_ANY, "register_matching_rule: not usable %s\n",
def->mrd_desc, 0, 0 );
-#endif
return -1;
}
@@ -229,61 +229,60 @@ register_matching_rule(
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",
- 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
@@ -297,14 +296,14 @@ mru_destroy( void )
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);
}
}
@@ -315,11 +314,7 @@ matching_rule_use_init( void )
MatchingRule *mr;
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
LDAP_SLIST_FOREACH( mr, &mr_list, smr_next ) {
AttributeType *at;
@@ -362,15 +357,9 @@ matching_rule_use_init( void )
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 ) ) {
@@ -388,19 +377,11 @@ 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 */
@@ -443,9 +424,7 @@ int mr_schema_info( Entry *e )
{
AttributeDescription *ad_matchingRules = slap_schema.si_ad_matchingRules;
MatchingRule *mr;
-#ifdef SLAP_NVALUES
struct berval nval;
-#endif
LDAP_SLIST_FOREACH(mr, &mr_list, smr_next ) {
if ( mr->smr_usage & SLAP_MR_HIDE ) {
@@ -467,14 +446,10 @@ 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
-#ifdef SLAP_NVALUES
+
nval.bv_val = mr->smr_oid;
nval.bv_len = strlen(mr->smr_oid);
- if( attr_merge_one( e, ad_matchingRules, &mr->smr_str, &nval ) )
-#else
- if( attr_merge_one( e, ad_matchingRules, &mr->smr_str ) )
-#endif
- {
+ if( attr_merge_one( e, ad_matchingRules, &mr->smr_str, &nval ) ) {
return -1;
}
}
@@ -486,12 +461,9 @@ int mru_schema_info( Entry *e )
AttributeDescription *ad_matchingRuleUse
= slap_schema.si_ad_matchingRuleUse;
MatchingRuleUse *mru;
-#ifdef SLAP_NVALUES
struct berval nval;
-#endif
LDAP_SLIST_FOREACH( mru, &mru_list, smru_next ) {
-
assert( !( mru->smru_usage & SLAP_MR_HIDE ) );
if ( mru->smru_str.bv_val == NULL ) {
@@ -505,14 +477,10 @@ 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
-#ifdef SLAP_NVALUES
+
nval.bv_val = mru->smru_oid;
nval.bv_len = strlen(mru->smru_oid);
- if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str, &nval ) )
-#else
- if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str ) )
-#endif
- {
+ if( attr_merge_one( e, ad_matchingRuleUse, &mru->smru_str, &nval ) ) {
return -1;
}
}