ece3519410
username in getpwnam() Resolves: rhbz#758425 - LDAP failover not working if server refuses connections
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 11f9ae2ef3a4884b5e7750a3d549a58a71abc015 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
|
Date: Mon, 28 Nov 2011 11:26:41 -0500
|
|
Subject: [PATCH 4/4] LDAP: Try next failover server on any error
|
|
|
|
---
|
|
src/providers/ldap/sdap_async_connection.c | 14 +++++---------
|
|
1 files changed, 5 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
|
|
index c69b9bce0f4649e76138168a4883c138ff5c721f..045f009c2f62e4d3d4d906a017508c2f4fbceda9 100644
|
|
--- a/src/providers/ldap/sdap_async_connection.c
|
|
+++ b/src/providers/ldap/sdap_async_connection.c
|
|
@@ -1226,16 +1226,12 @@ static void sdap_cli_connect_done(struct tevent_req *subreq)
|
|
ret = sdap_connect_recv(subreq, state, &state->sh);
|
|
talloc_zfree(subreq);
|
|
if (ret) {
|
|
- if (ret == ETIMEDOUT) { /* retry another server */
|
|
- fo_set_port_status(state->srv, PORT_NOT_WORKING);
|
|
- ret = sdap_cli_resolve_next(req);
|
|
- if (ret != EOK) {
|
|
- tevent_req_error(req, ret);
|
|
- }
|
|
- return;
|
|
+ /* retry another server */
|
|
+ fo_set_port_status(state->srv, PORT_NOT_WORKING);
|
|
+ ret = sdap_cli_resolve_next(req);
|
|
+ if (ret != EOK) {
|
|
+ tevent_req_error(req, ret);
|
|
}
|
|
-
|
|
- tevent_req_error(req, ret);
|
|
return;
|
|
}
|
|
|
|
--
|
|
1.7.7.3
|
|
|