From e5f455afbc2d149527bfd08f4e89903a3a8da17a Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Tue, 18 Jun 2013 12:28:36 +0200 Subject: failover: return error when SRV lookup returned only duplicates https://fedorahosted.org/sssd/ticket/1947 Otherwise we risk that the meta server is removed from the server list, but without a chance to return, because there may be no fo_server with srv_data = meta. Also if state->meta->next is NULL (it is still orphaned because we try to errornously expand it without invoking collapse first), state->out will be NULL and SSSD will crash. New error code: ERR_SRV_DUPLICATES --- src/providers/fail_over.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/providers/fail_over.c') diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c index c4dd1ea0..c5db7024 100644 --- a/src/providers/fail_over.c +++ b/src/providers/fail_over.c @@ -1288,21 +1288,40 @@ resolve_srv_done(struct tevent_req *subreq) backup_servers, num_backup_servers, state->meta->srv_data, state->meta->user_data, - false, NULL); + false, &last_server); if (ret != EOK) { goto done; } } + if (last_server == state->meta) { + /* SRV lookup returned only those servers + * that are already present. */ + DEBUG(SSSDBG_TRACE_FUNC, ("SRV lookup did not return " + "any new server.\n")); + ret = ERR_SRV_DUPLICATES; + goto done; + } + + /* At least one new server was inserted. + * We will return the first new server. */ + if (state->meta->next == NULL) { + DEBUG(SSSDBG_CRIT_FAILURE, + ("BUG: state->meta->next is NULL\n")); + ret = ERR_INTERNAL; + goto done; + } + state->out = state->meta->next; + /* And remove meta server from the server list. It will be + * inserted again during srv collapse. */ DLIST_REMOVE(state->service->server_list, state->meta); if (state->service->last_tried_server == state->meta) { state->service->last_tried_server = state->out; } set_srv_data_status(state->meta->srv_data, SRV_RESOLVED); - ret = EOK; break; case ERR_SRV_NOT_FOUND: -- cgit