|
 |
6cf099 |
From d170e144a1ae702ba55c508599ffbda4e95919e5 Mon Sep 17 00:00:00 2001
|
|
|
6cf099 |
From: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
6cf099 |
Date: Wed, 2 Sep 2015 13:40:48 +0200
|
|
|
6cf099 |
Subject: [PATCH 76/87] SDAP: Do not set is_offline if ignore_mark_offline is
|
|
|
6cf099 |
set
|
|
|
6cf099 |
MIME-Version: 1.0
|
|
|
6cf099 |
Content-Type: text/plain; charset=UTF-8
|
|
|
6cf099 |
Content-Transfer-Encoding: 8bit
|
|
|
6cf099 |
|
|
|
6cf099 |
Required for:
|
|
|
6cf099 |
https://fedorahosted.org/sssd/ticket/2637
|
|
|
6cf099 |
|
|
|
6cf099 |
The caller of the sdap_id_op requests can set the ignore_mark_offline
|
|
|
6cf099 |
flag to avoid the sdap_id_op from marking the whole back end as offline.
|
|
|
6cf099 |
|
|
|
6cf099 |
However, there was a small bug - the is_offline internal sdap_id_op flag
|
|
|
6cf099 |
was still being set. As a consequence, the error code from the
|
|
|
6cf099 |
connection was ignored and EAGAIN was always returned.
|
|
|
6cf099 |
|
|
|
6cf099 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
6cf099 |
(cherry picked from commit 0561d532cf76b035b73cfed929a6896071dac407)
|
|
|
6cf099 |
---
|
|
|
6cf099 |
src/providers/ldap/sdap_id_op.c | 2 +-
|
|
|
6cf099 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6cf099 |
|
|
|
6cf099 |
diff --git a/src/providers/ldap/sdap_id_op.c b/src/providers/ldap/sdap_id_op.c
|
|
|
6cf099 |
index 508bbd2ad3ebb3f9159a8b7f48258ff31a7cd6e2..0474a9cb7828ef43ef76cf6bebac077315296875 100644
|
|
|
6cf099 |
--- a/src/providers/ldap/sdap_id_op.c
|
|
|
6cf099 |
+++ b/src/providers/ldap/sdap_id_op.c
|
|
|
6cf099 |
@@ -567,9 +567,9 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq)
|
|
|
6cf099 |
DEBUG(SSSDBG_CRIT_FAILURE,
|
|
|
6cf099 |
"Failed to connect, going offline (%d [%s])\n",
|
|
|
6cf099 |
ret, strerror(ret));
|
|
|
6cf099 |
+ is_offline = true;
|
|
|
6cf099 |
be_mark_offline(conn_cache->id_conn->id_ctx->be);
|
|
|
6cf099 |
}
|
|
|
6cf099 |
- is_offline = true;
|
|
|
6cf099 |
}
|
|
|
6cf099 |
|
|
|
6cf099 |
if (ret == EOK) {
|
|
|
6cf099 |
--
|
|
|
6cf099 |
2.4.3
|
|
|
6cf099 |
|