/* mr.c - routines to manage matching rule definitions */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
struct mindexrec {
- char *mir_name;
+ struct berval mir_name;
MatchingRule *mir_mr;
};
struct mindexrec *mir2
)
{
- return (strcmp( mir1->mir_name, mir2->mir_name ));
+ 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 ));
}
static int
mr_index_name_cmp(
- char *name,
+ struct berval *name,
struct mindexrec *mir
)
{
- return (strcmp( name, mir->mir_name ));
+ 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 ));
}
MatchingRule *
mr_find( const char *mrname )
+{
+ struct berval bv;
+
+ bv.bv_val = (char *)mrname;
+ bv.bv_len = strlen( mrname );
+ return mr_bvfind( &bv );
+}
+
+MatchingRule *
+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 ) {
+ (AVL_CMP) mr_index_name_cmp )) != NULL ) {
return( mir->mir_mr );
}
return( NULL );
}
+void
+mr_destroy( void )
+{
+ MatchingRule *m, *n;
+
+ avl_free(mr_index, ldap_memfree);
+ for (m=mr_list; m; m=n) {
+ n = m->smr_next;
+ ldap_matchingrule_free((LDAPMatchingRule *)m);
+ }
+}
+
static int
mr_insert(
MatchingRule *smr,
if ( smr->smr_oid ) {
mir = (struct mindexrec *)
ch_calloc( 1, sizeof(struct mindexrec) );
- mir->mir_name = smr->smr_oid;
+ mir->mir_name.bv_val = smr->smr_oid;
+ 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,
return SLAP_SCHERR_DUP_RULE;
}
/* FIX: temporal consistency check */
- mr_find(mir->mir_name);
+ mr_bvfind(&mir->mir_name);
}
if ( (names = smr->smr_names) ) {
while ( *names ) {
mir = (struct mindexrec *)
ch_calloc( 1, sizeof(struct mindexrec) );
- mir->mir_name = ch_strdup(*names);
+ mir->mir_name.bv_val = *names;
+ mir->mir_name.bv_len = strlen( *names );
mir->mir_mr = smr;
if ( avl_insert( &mr_index, (caddr_t) mir,
(AVL_CMP) mr_index_cmp,
return SLAP_SCHERR_DUP_RULE;
}
/* FIX: temporal consistency check */
- mr_find(mir->mir_name);
+ mr_bvfind(&mir->mir_name);
names++;
}
}
int
mr_add(
- LDAP_MATCHING_RULE *mr,
+ LDAPMatchingRule *mr,
unsigned usage,
slap_mr_convert_func *convert,
slap_mr_normalize_func *normalize,
slap_mr_match_func *match,
slap_mr_indexer_func *indexer,
slap_mr_filter_func *filter,
+ MatchingRule *amr,
const char **err
)
{
int code;
smr = (MatchingRule *) ch_calloc( 1, sizeof(MatchingRule) );
- memcpy( &smr->smr_mrule, mr, sizeof(LDAP_MATCHING_RULE));
+ AC_MEMCPY( &smr->smr_mrule, mr, sizeof(LDAPMatchingRule));
+ smr->smr_oidlen = strlen( mr->mr_oid );
smr->smr_usage = usage;
smr->smr_convert = convert;
smr->smr_normalize = normalize;
smr->smr_match = match;
smr->smr_indexer = indexer;
smr->smr_filter = filter;
+ smr->smr_associated = amr;
if ( smr->smr_syntax_oid ) {
if ( (syn = syn_find(smr->smr_syntax_oid)) ) {
int
register_matching_rule(
- char * desc,
+ const char * desc,
unsigned usage,
slap_mr_convert_func *convert,
slap_mr_normalize_func *normalize,
slap_mr_match_func *match,
slap_mr_indexer_func *indexer,
- slap_mr_filter_func *filter )
+ slap_mr_filter_func *filter,
+ const char* associated )
{
- LDAP_MATCHING_RULE *mr;
+ LDAPMatchingRule *mr;
+ MatchingRule *amr = NULL;
int code;
const char *err;
if( usage == SLAP_MR_NONE ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "register_matching_rule: %s not usable\n", desc ));
+#else
Debug( LDAP_DEBUG_ANY, "register_matching_rule: not usable %s\n",
desc, 0, 0 );
+#endif
+
return -1;
}
- mr = ldap_str2matchingrule( desc, &code, &err);
+ if( associated != NULL ) {
+ amr = mr_find( associated );
+
+#if 0
+ /* ignore for now */
+
+ if( amr == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "register_matching_rule: could not locate associated matching rule %s for %s\n",
+ associated, desc ));
+#else
+ Debug( LDAP_DEBUG_ANY, "register_matching_rule: could not locate "
+ "associated matching rule %s for %s\n",
+ associated, desc, 0 );
+#endif
+
+ return -1;
+ }
+#endif
+
+ }
+
+ mr = ldap_str2matchingrule( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
if ( !mr ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "register_matching_rule: %s before %s in %s.\n",
+ ldap_scherr2str(code), err, desc ));
+#else
Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s before %s in %s\n",
ldap_scherr2str(code), err, desc );
+#endif
+
return( -1 );
}
- code = mr_add( mr, usage, convert, normalize, match, indexer, filter, &err );
+ code = mr_add( mr, usage,
+ convert, normalize, match, indexer, filter, amr,
+ &err );
+
+ ldap_memfree( mr );
+
if ( code ) {
- Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s for %s in %s\n",
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "register_matching_rule: %s for %s in %s.\n",
+ scherr2str(code), err, desc ));
+#else
+ Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s for %s in %s\n",
scherr2str(code), err, desc );
+#endif
+
return( -1 );
}
+
return( 0 );
}
int mr_schema_info( Entry *e )
{
- struct berval val;
- struct berval *vals[2];
+ struct berval vals[2];
MatchingRule *mr;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *ad_matchingRules = slap_schema.si_ad_matchingRules;
-#else
- char *ad_matchingRules = "matchingRules";
-#endif
- vals[0] = &val;
- vals[1] = NULL;
+ vals[1].bv_val = NULL;
for ( mr = mr_list; mr; mr = mr->smr_next ) {
- val.bv_val = ldap_matchingrule2str( &mr->smr_mrule );
+ if ( mr->smr_usage & SLAP_MR_HIDE ) {
+ /* skip hidden rules */
+ continue;
+ }
- if ( val.bv_val == NULL ) {
- return -1;
+ if ( ! mr->smr_match ) {
+ /* skip rules without matching functions */
+ continue;
}
- val.bv_len = strlen( val.bv_val );
+ if ( ldap_matchingrule2bv( &mr->smr_mrule, vals ) == NULL ) {
+ return -1;
+ }
+#if 0
Debug( LDAP_DEBUG_TRACE, "Merging mr [%ld] %s\n",
- (long) val.bv_len, val.bv_val, 0 );
+ (long) vals[0].bv_len, vals[0].bv_val, 0 );
+#endif
attr_merge( e, ad_matchingRules, vals );
- ldap_memfree( val.bv_val );
+ ldap_memfree( vals[0].bv_val );
}
return 0;
}
projects / openldap / blobdiff