From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 29 Aug 2002 10:50:12 +0000 (+0000)
Subject: cleanup
X-Git-Tag: NO_SLAP_OP_BLOCKS~1116
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d855f97372d6887960fa011542d925a7488f9a23;p=openldap

cleanup
---

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 90cb1927cc..fada8cb8cd 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -142,14 +142,12 @@ do_search(
 			send_ldap_disconnect( conn, op,
 				LDAP_PROTOCOL_ERROR, text );
 		} else {
-			send_ldap_result( conn, op, rc,
-				NULL, text, NULL, NULL );
+			send_ldap_result( conn, op, rc, 
+					NULL, text, NULL, NULL );
 		}
 		goto return_results;
-
-	} else {
-		filter2bv( filter, &fstr );
 	}
+	filter2bv( filter, &fstr );
 
 #ifdef NEW_LOGGING
 	LDAP_LOG( OPERATION, ARGS, 
@@ -319,7 +317,7 @@ do_search(
 	if ( be->be_search ) {
 		(*be->be_search)( be, conn, op, &pbase, &nbase,
 			scope, deref, sizelimit,
-		    timelimit, filter, &fstr, an, attrsonly );
+			timelimit, filter, &fstr, an, attrsonly );
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
 			NULL, "operation not supported within namingContext",