From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 17 Sep 2002 04:09:53 +0000 (+0000)
Subject: Fix search return code
X-Git-Tag: OPENLDAP_REL_ENG_2_1_5~19
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c536b42a7e6b022e388d3e2ad301cffadbdfc7ea;p=openldap

Fix search return code
---

diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c
index 16d49e8495..800ada5dc0 100644
--- a/servers/slapd/back-monitor/search.c
+++ b/servers/slapd/back-monitor/search.c
@@ -187,6 +187,7 @@ monitor_back_search(
 					attrsonly, NULL );
 			nentries = 1;
 		}
+		rc = LDAP_SUCCESS;
 		monitor_cache_release( mi, e );
 		break;
 
@@ -195,7 +196,7 @@ monitor_back_search(
 				attrs, attrsonly,
 				e, 0, &nentries );
 		if ( rc ) {
-			// error
+			rc = LDAP_OTHER;
 		}		
 		
 		break;
@@ -213,14 +214,14 @@ monitor_back_search(
 				attrs, attrsonly,
 				e, 1, &nentries );
 		if ( rc ) {
-			// error
+			rc = LDAP_OTHER;
 		}
 
 		break;
 	}
 	
-	send_search_result( conn, op, LDAP_SUCCESS,
+	send_search_result( conn, op, rc,
 			NULL, NULL, NULL, NULL, nentries );
 
-	return( 0 );
+	return( rc == LDAP_SUCCESS ? 0 : 1 );
 }