From 86a16cf3b234597c03fba52dfdfb21a623093254 Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Mon, 28 Jan 2013 10:56:56 +0100 Subject: nested groups: fix group lookup hangs if member dn is incorrect https://fedorahosted.org/sssd/ticket/1783 When dn in member attribute is invalid (e.g. rdn instead of dn) or it is outside of configured search bases, we might hit a situation when tevent_req is marked as done before any callback could be attached on it. --- src/providers/ldap/sdap_async_groups.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index 96cc7c0c1..76c077d83 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -2528,6 +2528,11 @@ struct sdap_nested_group_ctx { bool enable_deref; struct sdap_deref_ctx *derefctx; + + /** + * FIXME: Remove me! + */ + bool send_finished; }; static errno_t sdap_nested_group_process_deref_step(struct tevent_req *req); @@ -2564,6 +2569,7 @@ static struct tevent_req *sdap_nested_group_process_send( state->sh = sh; state->enable_deref = enable_deref; state->nesting_level = nesting; + state->send_finished = false; /* If this is too many levels deep, just return success */ if (nesting > dp_opt_get_int(opts->basic, SDAP_NESTING_LEVEL)) { @@ -2672,6 +2678,7 @@ static struct tevent_req *sdap_nested_group_process_send( if (ret != EAGAIN) goto immediate; } + state->send_finished = true; return req; immediate: @@ -2681,6 +2688,7 @@ immediate: tevent_req_error(req, ret); } tevent_req_post(req, ev); + state->send_finished = true; return req; } @@ -3209,6 +3217,14 @@ static errno_t sdap_nested_group_lookup_user(struct tevent_req *req, } else if (ret == EOK) { DEBUG(SSSDBG_TRACE_FUNC, ("All done.\n")); tevent_req_done(req); + + /** + * FIXME: Rewrite nested group processing so we call + * tevent_req_post() only in _send(). + */ + if (state->send_finished == false) { + tevent_req_post(req, state->ev); + } } return EOK; } @@ -3265,6 +3281,14 @@ static errno_t sdap_nested_group_lookup_group(struct tevent_req *req) } else if (ret == EOK) { DEBUG(SSSDBG_TRACE_FUNC, ("All done.\n")); tevent_req_done(req); + + /** + * FIXME: Rewrite nested group processing so we call + * tevent_req_post() only in _send(). + */ + if (state->send_finished == false) { + tevent_req_post(req, state->ev); + } } return EOK; } -- cgit