|
 |
b2d430 |
From abbbcb79ff0c5b82d7a3acb324c3d44f87479837 Mon Sep 17 00:00:00 2001
|
|
|
b2d430 |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
b2d430 |
Date: Mon, 12 Sep 2016 17:36:09 +0200
|
|
|
b2d430 |
Subject: [PATCH 136/140] LDAP: Return partial results from adminlimit exceeded
|
|
|
b2d430 |
MIME-Version: 1.0
|
|
|
b2d430 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b2d430 |
Content-Transfer-Encoding: 8bit
|
|
|
b2d430 |
|
|
|
b2d430 |
Resolves:
|
|
|
b2d430 |
https://fedorahosted.org/sssd/ticket/3185
|
|
|
b2d430 |
|
|
|
b2d430 |
Since commit c420ce830ac0b0b288a2a887ec2cfce5c748018c we try to move to
|
|
|
b2d430 |
the next server on any error on the connection, which in case there is
|
|
|
b2d430 |
only one server sends SSSD offline.
|
|
|
b2d430 |
|
|
|
b2d430 |
It's more graceful to try to process the results, same as we already do
|
|
|
b2d430 |
with sizelimit exceeded.
|
|
|
b2d430 |
|
|
|
b2d430 |
Reviewed-by: Michal Židek <mzidek@redhat.com>
|
|
|
b2d430 |
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
|
b2d430 |
(cherry picked from commit 3319d964721396c07daba383ded6aaaf33ed6e3b)
|
|
|
b2d430 |
---
|
|
|
b2d430 |
src/providers/ldap/sdap_async.c | 3 ++-
|
|
|
b2d430 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
b2d430 |
|
|
|
b2d430 |
diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c
|
|
|
b2d430 |
index 4195ba95d911f3956f8cca665310b4b92091e6cd..b8e04b9d8464d7c2c681080cba456c34b93b923a 100644
|
|
|
b2d430 |
--- a/src/providers/ldap/sdap_async.c
|
|
|
b2d430 |
+++ b/src/providers/ldap/sdap_async.c
|
|
|
b2d430 |
@@ -1526,7 +1526,8 @@ static void sdap_get_generic_op_finished(struct sdap_op *op,
|
|
|
b2d430 |
sss_ldap_err2string(result), result,
|
|
|
b2d430 |
errmsg ? errmsg : "no errmsg set");
|
|
|
b2d430 |
|
|
|
b2d430 |
- if (result == LDAP_SIZELIMIT_EXCEEDED) {
|
|
|
b2d430 |
+ if (result == LDAP_SIZELIMIT_EXCEEDED
|
|
|
b2d430 |
+ || result == LDAP_ADMINLIMIT_EXCEEDED) {
|
|
|
b2d430 |
/* Try to return what we've got */
|
|
|
b2d430 |
|
|
|
b2d430 |
if ( ! (state->flags & SDAP_SRCH_FLG_SIZELIMIT_SILENT)) {
|
|
|
b2d430 |
--
|
|
|
b2d430 |
2.7.4
|
|
|
b2d430 |
|