From: Howard Chu <hyc@openldap.org>
Date: Mon, 25 Mar 2002 11:52:39 +0000 (+0000)
Subject: Fix ITS#1675, make sure search results are initialized
X-Git-Tag: OPENLDAP_REL_ENG_2_MP~318
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f20a6a27b375dbbd0af77c8b4e4016f8b9526000;p=openldap

Fix ITS#1675, make sure search results are initialized
---

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 4b0b49000f..63dd4158ad 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -327,6 +327,7 @@ glue_back_search (
 	case LDAP_SCOPE_ONELEVEL:
 	case LDAP_SCOPE_SUBTREE:
 		op->o_callback = &cb;
+		rc = gs.err = LDAP_UNWILLING_TO_PERFORM;
 
 		/*
 		 * Execute in reverse order, most general first 
@@ -336,13 +337,17 @@ glue_back_search (
 				continue;
 			if (tlimit) {
 				t2limit = stoptime - slap_get_time ();
-				if (t2limit <= 0)
+				if (t2limit <= 0) {
+					rc = gs.err = LDAP_TIMELIMIT_EXCEEDED;
 					break;
+				}
 			}
 			if (slimit) {
 				s2limit = slimit - gs.nentries;
-				if (s2limit <= 0)
+				if (s2limit <= 0) {
+					rc = gs.err = LDAP_SIZELIMIT_EXCEEDED;
 					break;
+				}
 			}
 			/*
 			 * check for abandon