cleanup

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 7a47daff6d6fc778df6e68d0d1607b53a40c4e34..8524d1aee39e7e26458cc550315f99da7b698b5d 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -298,11 +298,7 @@ fe_op_compare( Operation *op, SlapReply *rs )
                }
                send_ldap_result( op, rs );
 
-               if ( rs->sr_err == LDAP_COMPARE_TRUE ||
-                       rs->sr_err == LDAP_COMPARE_FALSE )
-               {
-                       rs->sr_err = LDAP_SUCCESS;
-               }
+               if( rc == 0 ) rs->sr_err = LDAP_SUCCESS;
 
        } else if ( op->o_bd->be_compare ) {
                op->o_bd->be_compare( op, rs );

diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index bd4b195ca47e282bcad416dcc93bbe87b49d9983..0021f85996b0680128408fb95909700c592645bf 100644 (file)
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -37,9 +37,12 @@
 static int     test_filter_and( Operation *op, Entry *e, Filter *flist );
 static int     test_filter_or( Operation *op, Entry *e, Filter *flist );
 static int     test_substrings_filter( Operation *op, Entry *e, Filter *f);
-static int     test_ava_filter( Operation *op, Entry *e, AttributeAssertion *ava, int type );
-static int     test_mra_filter( Operation *op, Entry *e, MatchingRuleAssertion *mra );
-static int     test_presence_filter( Operation *op, Entry *e, AttributeDescription *desc );
+static int     test_ava_filter( Operation *op,
+       Entry *e, AttributeAssertion *ava, int type );
+static int     test_mra_filter( Operation *op,
+       Entry *e, MatchingRuleAssertion *mra );
+static int     test_presence_filter( Operation *op,
+       Entry *e, AttributeDescription *desc );
 
 
 /*
@@ -73,21 +76,21 @@ test_filter(
 
        case LDAP_FILTER_EQUALITY:
                Debug( LDAP_DEBUG_FILTER, "    EQUALITY\n", 0, 0, 0 );
-
                rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_EQUALITY );
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
                Debug( LDAP_DEBUG_FILTER, "    SUBSTRINGS\n", 0, 0, 0 );
-
                rc = test_substrings_filter( op, e, f );
                break;
 
        case LDAP_FILTER_GE:
+               Debug( LDAP_DEBUG_FILTER, "    GE\n", 0, 0, 0 );
                rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_GE );
                break;
 
        case LDAP_FILTER_LE:
+               Debug( LDAP_DEBUG_FILTER, "    LE\n", 0, 0, 0 );
                rc = test_ava_filter( op, e, f->f_ava, LDAP_FILTER_LE );
                break;
 
@@ -358,8 +361,12 @@ test_ava_filter(
                int     hasSubordinates;
                struct berval   hs;
 
-               /* No other match is allowed */
-               if( type != LDAP_FILTER_EQUALITY ) return LDAP_OTHER;
+               if( type != LDAP_FILTER_EQUALITY &&
+                       type != LDAP_FILTER_APPROX )
+               {
+                       /* No other match is allowed */
+                       return LDAP_OTHER;
+               }
                
                if ( op->o_bd->be_has_subordinates( op, e, &hasSubordinates ) !=
                        LDAP_SUCCESS )
@@ -510,8 +517,7 @@ static int
 test_filter_or(
        Operation       *op,
        Entry   *e,
-       Filter  *flist
-)
+       Filter  *flist )
 {
        Filter  *f;
        int rtn = LDAP_COMPARE_FALSE; /* False if empty */