fix ITS#3488

diff --git a/CHANGES b/CHANGES
index 3322fc6909677f2c660f4d3af9cb55f76c49fbe5..32801e91ed7fc5330c3e45fd4b4e2640312caa10 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.2.21 Engineering
        Fixed back-bdb entry e_ocflags reset on objectClass modify
        Fixed back-bdb retcode on referral (ITS#3475)
        Fixed back-bdb detecting deadlock in indexer (ITS#3481)
+       Fixed back-sql access checking on search (ITS#3488)
        Build Environment
                Misc fixes for dynamic modules (ITS#3401, #3428)
        Documentation

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index 31fac986cac4fceefacb1ca72736eabe4dd95324..5c026f5f6cd90920490c41e2c5e7163bd0ea8c02 100644 (file)
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -1720,16 +1720,11 @@ backsql_search( Operation *op, SlapReply *rs )
                        rs->sr_entry = NULL;
                        rs->sr_attrs = NULL;
 
-                       switch ( sres ) {
-                       case 0:
-                               break;
-
-                       default:
+                       if ( sres == -1 ) {
                                /*
                                 * FIXME: send_search_entry failed;
                                 * better stop
                                 */
-                       case -1:
                                Debug( LDAP_DEBUG_TRACE, "backsql_search(): "
                                        "connection lost\n", 0, 0, 0 );
                                goto end_of_search;