fix for select_backend suggested G. Gombas (ITS 1090)

[openldap] / servers / slapd / filterentry.c

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index bd3e62eaed3b187d0c59f20822e00718b06d9996..34cf68d6587aa9a2f10446f682680918364961ff 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -21,7 +21,7 @@ static int    test_filter_and( Backend *be,
 static int     test_filter_or( Backend *be,
        Connection *conn, Operation *op,
        Entry *e, Filter *flist );
-static int     test_substring_filter( Backend *be,
+static int     test_substrings_filter( Backend *be,
        Connection *conn, Operation *op,
        Entry *e, Filter *f);
 static int     test_ava_filter( Backend *be,
@@ -55,27 +55,56 @@ test_filter(
 {
        int     rc;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_filter: begin\n" ));
+#else
        Debug( LDAP_DEBUG_FILTER, "=> test_filter\n", 0, 0, 0 );
+#endif
+
 
        switch ( f->f_choice ) {
        case SLAPD_FILTER_COMPUTED:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter:   COMPUTED %s (%d)\n",
+                          f->f_result == LDAP_COMPARE_FALSE ? "false" :
+                          f->f_result == LDAP_COMPARE_TRUE      ? "true"  :
+                          f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" :
+                          "error",
+                          f->f_result ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    COMPUTED %s (%d)\n",
                        f->f_result == LDAP_COMPARE_FALSE ? "false" :
                        f->f_result == LDAP_COMPARE_TRUE ? "true" :
                        f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" : "error",
                        f->f_result, 0 );
+#endif
+
                rc = f->f_result;
                break;
 
        case LDAP_FILTER_EQUALITY:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter:   EQUALITY\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    EQUALITY\n", 0, 0, 0 );
+#endif
+
                rc = test_ava_filter( be, conn, op, e, f->f_ava,
                    LDAP_FILTER_EQUALITY );
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter  SUBSTRINGS\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    SUBSTRINGS\n", 0, 0, 0 );
-               rc = test_substring_filter( be, conn, op, e, f );
+#endif
+
+               rc = test_substrings_filter( be, conn, op, e, f );
                break;
 
        case LDAP_FILTER_GE:
@@ -89,28 +118,57 @@ test_filter(
                break;
 
        case LDAP_FILTER_PRESENT:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter:        PRESENT\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    PRESENT\n", 0, 0, 0 );
+#endif
+
                rc = test_presence_filter( be, conn, op, e, f->f_desc );
                break;
 
        case LDAP_FILTER_APPROX:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter: APPROX\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    APPROX\n", 0, 0, 0 );
+#endif
                rc = test_ava_filter( be, conn, op, e, f->f_ava,
                    LDAP_FILTER_APPROX );
                break;
 
        case LDAP_FILTER_AND:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter:  AND\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    AND\n", 0, 0, 0 );
+#endif
+
                rc = test_filter_and( be, conn, op, e, f->f_and );
                break;
 
        case LDAP_FILTER_OR:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter:        OR\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    OR\n", 0, 0, 0 );
+#endif
+
                rc = test_filter_or( be, conn, op, e, f->f_or );
                break;
 
        case LDAP_FILTER_NOT:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter:        NOT\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    NOT\n", 0, 0, 0 );
+#endif
+
                rc = test_filter( be, conn, op, e, f->f_not );
 
                switch( rc ) {
@@ -125,18 +183,37 @@ test_filter(
 
 #ifdef SLAPD_EXT_FILTERS
        case LDAP_FILTER_EXT:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
+                          "test_filter:        EXT\n" ));
+#else
                Debug( LDAP_DEBUG_FILTER, "    EXT\n", 0, 0, 0 );
+#endif
+
                rc = test_mra_filter( be, conn, op, e, f->f_mra );
                break;
 #endif
 
        default:
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
+                          "test_filter:  unknown filter type %lu\n", 
+                      f->f_choice ));
+#else
                Debug( LDAP_DEBUG_ANY, "    unknown filter type %lu\n",
                    f->f_choice, 0, 0 );
+#endif
+
                rc = LDAP_PROTOCOL_ERROR;
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_filter:  return=%d\n", rc ));
+#else
        Debug( LDAP_DEBUG_FILTER, "<= test_filter %d\n", rc, 0, 0 );
+#endif
+
        return( rc );
 }
 
@@ -171,6 +248,8 @@ test_ava_filter(
                        mr = a->a_desc->ad_type->sat_approx;
                        if( mr != NULL ) break;
 
+                       /* use EQUALITY matching rule if no APPROX rule */
+
                case LDAP_FILTER_EQUALITY:
                        mr = a->a_desc->ad_type->sat_equality;
                        break;
@@ -193,7 +272,7 @@ test_ava_filter(
                        int rc;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr,
+                       rc = value_match( &ret, a->a_desc, mr, 0,
                                a->a_vals[i], ava->aa_value,
                                &text );
 
@@ -260,7 +339,13 @@ test_filter_and(
        Filter  *f;
        int rtn = LDAP_COMPARE_TRUE;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_filter_and: begin\n" ));
+#else
        Debug( LDAP_DEBUG_FILTER, "=> test_filter_and\n", 0, 0, 0 );
+#endif
+
 
        for ( f = flist; f != NULL; f = f->f_next ) {
                int rc = test_filter( be, conn, op, e, f );
@@ -274,7 +359,13 @@ test_filter_and(
                }
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_filter_and:  rc=%d\n", rtn ));
+#else
        Debug( LDAP_DEBUG_FILTER, "<= test_filter_and %d\n", rtn, 0, 0 );
+#endif
+
        return rtn;
 }
 
@@ -290,7 +381,13 @@ test_filter_or(
        Filter  *f;
        int rtn = LDAP_COMPARE_FALSE;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_filter_or: begin\n" ));
+#else
        Debug( LDAP_DEBUG_FILTER, "=> test_filter_or\n", 0, 0, 0 );
+#endif
+
 
        for ( f = flist; f != NULL; f = f->f_next ) {
                int rc = test_filter( be, conn, op, e, f );
@@ -304,13 +401,19 @@ test_filter_or(
                }
        }
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_filter_or: result=%d\n", rtn ));
+#else
        Debug( LDAP_DEBUG_FILTER, "<= test_filter_or %d\n", rtn, 0, 0 );
+#endif
+
        return rtn;
 }
 
 
 static int
-test_substring_filter(
+test_substrings_filter(
     Backend    *be,
     Connection *conn,
     Operation  *op,
@@ -320,7 +423,13 @@ test_substring_filter(
 {
        Attribute       *a;
 
-       Debug( LDAP_DEBUG_FILTER, "begin test_substring_filter\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_substrings_filter: begin\n" ));
+#else
+       Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
+#endif
+
 
        if ( be != NULL && ! access_allowed( be, conn, op, e,
                f->f_sub_desc, NULL, ACL_SEARCH ) )
@@ -344,7 +453,7 @@ test_substring_filter(
                        int rc;
                        const char *text;
 
-                       rc = value_match( &ret, a->a_desc, mr,
+                       rc = value_match( &ret, a->a_desc, mr, 0,
                                a->a_vals[i], f->f_sub,
                                &text );
 
@@ -358,6 +467,12 @@ test_substring_filter(
                }
        }
 
-       Debug( LDAP_DEBUG_FILTER, "end test_substring_filter 1\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
+                  "test_substrings_filter: return FALSE\n" ));
+#else
+       Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n", 0, 0, 0 );
+#endif
+
        return LDAP_COMPARE_FALSE;
 }