remove dbenv->lock_put() call from transaction-protected operations

[openldap] / servers / slapd / mr.c

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 34dae23bc0acf6bfe89cd2065e386816d250a1bb..f8e788b6e0082d66acd4d2b0676a08588e42c915 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -1,7 +1,7 @@
 /* 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
  */
 
@@ -52,7 +52,7 @@ mr_find( const char *mrname )
 {
        struct berval bv;
 
-       bv.bv_val = mrname;
+       bv.bv_val = (char *)mrname;
        bv.bv_len = strlen( mrname );
        return mr_bvfind( &bv );
 }
@@ -108,7 +108,7 @@ mr_insert(
                                 (AVL_DUP) avl_dup_error ) ) {
                        *err = smr->smr_oid;
                        ldap_memfree(mir);
-                       return SLAP_SCHERR_DUP_RULE;
+                       return SLAP_SCHERR_MR_DUP;
                }
                /* FIX: temporal consistency check */
                mr_bvfind(&mir->mir_name);
@@ -125,7 +125,7 @@ mr_insert(
                                         (AVL_DUP) avl_dup_error ) ) {
                                *err = *names;
                                ldap_memfree(mir);
-                               return SLAP_SCHERR_DUP_RULE;
+                               return SLAP_SCHERR_MR_DUP;
                        }
                        /* FIX: temporal consistency check */
                        mr_bvfind(&mir->mir_name);
@@ -272,32 +272,40 @@ register_matching_rule(
 
 int mr_schema_info( Entry *e )
 {
-       struct berval   val;
-       struct berval   *vals[2];
+       struct berval   vals[2];
        MatchingRule    *mr;
 
        AttributeDescription *ad_matchingRules = slap_schema.si_ad_matchingRules;
 
-       vals[0] = &val;
-       vals[1] = NULL;
+       vals[1].bv_val = NULL;
 
        for ( mr = mr_list; mr; mr = mr->smr_next ) {
+               if ( mr->smr_usage & SLAP_MR_HIDE ) {
+                       /* skip hidden rules */
+                       continue;
+               }
+
                if ( ! mr->smr_match ) {
                        /* skip rules without matching functions */
                        continue;
                }
 
-               if ( ldap_matchingrule2bv( &mr->smr_mrule, &val ) == NULL ) {
+               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;
 }
 
+int mru_schema_info( Entry *e )
+{
+       return 0;
+}
+
 #endif