Clean up include logging

[openldap] / servers / slapd / mr.c

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 7648fb6ac7cf0bde5893e11f3e16af8c5c91b946..5fa82b52319f819c0b8fadef8623372869cd30f6 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -36,7 +36,7 @@ mr_index_cmp(
 
 static int
 mr_index_name_cmp(
-    char               *name,
+    char               *name,
     struct mindexrec   *mir
 )
 {
@@ -49,7 +49,7 @@ mr_find( const char *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 );
@@ -168,8 +168,14 @@ register_matching_rule(
        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;
        }
 
@@ -180,9 +186,16 @@ register_matching_rule(
                /* 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
@@ -191,8 +204,15 @@ 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 ));
+#else
                Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s before %s in %s\n",
                    ldap_scherr2str(code), err, desc );
+#endif
+
                return( -1 );
        }
 
@@ -203,8 +223,15 @@ register_matching_rule(
        ldap_memfree( mr );
 
        if ( code ) {
+#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 );
        }
 
@@ -226,6 +253,11 @@ int mr_schema_info( Entry *e )
        vals[1] = NULL;
 
        for ( mr = mr_list; mr; mr = mr->smr_next ) {
+               if ( ! mr->smr_match ) {
+                       /* skip rules without matching functions */
+                       continue;
+               }
+
                val.bv_val = ldap_matchingrule2str( &mr->smr_mrule );
 
                if ( val.bv_val == NULL ) {