From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 15 Jan 2005 16:47:05 +0000 (+0000)
Subject: fix ITS#3488
X-Git-Tag: OPENLDAP_REL_ENG_2_2_21~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be876edd16b296fe3f1bdfe8200c8f8acd4d8436;p=thirdparty%2Fopenldap.git

fix ITS#3488
---

diff --git a/CHANGES b/CHANGES
index 3322fc6909..32801e91ed 100644
--- 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 31fac986ca..5c026f5f6c 100644
--- 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;