Import ITS#2007 and ITS#2009 bug fixes from HEAD

[openldap] / servers / slapd / mr.c

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index e1af29d0c88fbee2205347a255571b63422f67a5..dfa34c95d8c34620b6f1b4d194f898bcdf6409a6 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -16,7 +16,6 @@
 #include "slap.h"
 #include "ldap_pvt.h"
 
-
 struct mindexrec {
        struct berval   mir_name;
        MatchingRule    *mir_mr;
@@ -108,7 +107,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 +124,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);
@@ -198,8 +197,8 @@ register_matching_rule(
 
        if( usage == SLAP_MR_NONE ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "register_matching_rule: %s not usable\n", desc ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "register_matching_rule: %s not usable\n", desc, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "register_matching_rule: not usable %s\n",
                    desc, 0, 0 );
@@ -216,9 +215,9 @@ register_matching_rule(
 
                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 ));
+                       LDAP_LOG( OPERATION, ERR,
+                          "register_matching_rule: could not locate associated "
+                          "matching rule %s for %s\n",  associated, desc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "register_matching_rule: could not locate "
                                "associated matching rule %s for %s\n",
@@ -234,9 +233,9 @@ register_matching_rule(
        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 ));
+               LDAP_LOG( OPERATION, 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 );
@@ -253,9 +252,9 @@ register_matching_rule(
 
        if ( code ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "register_matching_rule: %s for %s in %s.\n",
-                          scherr2str(code), err, desc ));
+               LDAP_LOG( OPERATION, 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 );