|
 |
dc8c34 |
From 2691a06b0eacabe000e9629e0d222d8652f96192 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Tue, 26 Apr 2016 13:53:02 -0700
|
|
|
dc8c34 |
Subject: [PATCH 380/382] Ticket #48808 - Paged results search returns the
|
|
|
dc8c34 |
blank list of entries
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Bug Description: When a simple paged results slot in a connection is
|
|
|
dc8c34 |
discarded due to an error, e.g., SIZELIMIT_EXCEEDED, the slot was not
|
|
|
dc8c34 |
properly cleaned up. Then, if the slot was reused, the leftover flag
|
|
|
dc8c34 |
confused the code and ended up returning the 0 search result.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Fix Description: This patch adds the clean up code when a slot is re-
|
|
|
dc8c34 |
used.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/48808
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Reviewed by wibrown@redhat.com (Thank you, William!!)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
(cherry picked from commit 09180b25570696d24c86e3a046fb497c15549c64)
|
|
|
dc8c34 |
(cherry picked from commit a8486ab3b364a9ae088d6404d025058b04ac358d)
|
|
|
dc8c34 |
(cherry picked from commit e51b4238809a5421fd470f02853d38a70747f7bd)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/pagedresults.c | 1 +
|
|
|
dc8c34 |
1 file changed, 1 insertion(+)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c
|
|
|
dc8c34 |
index d10edd0..c714aff 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/pagedresults.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/pagedresults.c
|
|
|
dc8c34 |
@@ -145,6 +145,7 @@ pagedresults_parse_control_value( Slapi_PBlock *pb,
|
|
|
dc8c34 |
prp = conn->c_pagedresults.prl_list;
|
|
|
dc8c34 |
for (i = 0; i < conn->c_pagedresults.prl_maxlen; i++, prp++) {
|
|
|
dc8c34 |
if (!prp->pr_current_be) { /* unused slot; take it */
|
|
|
dc8c34 |
+ _pr_cleanup_one_slot(prp);
|
|
|
dc8c34 |
prp->pr_current_be = be;
|
|
|
dc8c34 |
*index = i;
|
|
|
dc8c34 |
break;
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
2.4.11
|
|
|
dc8c34 |
|