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 6dde6c6ac0568f1626e34df45fa5421258027b2d..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
  */
 
@@ -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);
@@ -280,6 +280,11 @@ int mr_schema_info( Entry *e )
        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;
@@ -298,4 +303,9 @@ int mr_schema_info( Entry *e )
        return 0;
 }
 
+int mru_schema_info( Entry *e )
+{
+       return 0;
+}
+
 #endif