diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2012-05-22 17:41:52 +0200 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-05-22 13:23:12 -0400 |
| commit | 6efb62b8b94405cfd0afecbf2d04985b6f44419b (patch) | |
| tree | fe67f78d05ce168cd5915465671b2555af513ace | |
| parent | 583025ba4ce58273e4a2fe645b96ccb421fcfb67 (diff) | |
| download | sssd-6efb62b8b94405cfd0afecbf2d04985b6f44419b.tar.gz sssd-6efb62b8b94405cfd0afecbf2d04985b6f44419b.tar.xz sssd-6efb62b8b94405cfd0afecbf2d04985b6f44419b.zip | |
LDAP nested groups: Do not process callback with _post deep in the nested structure
https://fedorahosted.org/sssd/ticket/1343
| -rw-r--r-- | src/providers/ldap/sdap_async_groups.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index 84eb7cbfd..b587f668e 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -2498,14 +2498,13 @@ static errno_t sdap_nested_group_lookup_user(struct tevent_req *req, ret = sdap_nested_group_process_step(req); } - if (ret == EOK) { - /* EOK means it's complete */ - tevent_req_done(req); - tevent_req_post(req, state->ev); - } else if (ret != EAGAIN) { + if (ret != EOK && ret != EAGAIN) { + DEBUG(SSSDBG_OP_FAILURE, ("Nested group processing failed\n")); return ret; + } else if (ret == EOK) { + DEBUG(SSSDBG_TRACE_FUNC, ("All done.\n")); + tevent_req_done(req); } - return EOK; } /* @@ -2583,14 +2582,13 @@ static errno_t sdap_nested_group_lookup_group(struct tevent_req *req) ret = sdap_nested_group_process_step(req); } - if (ret == EOK) { - /* EOK means it's complete */ - tevent_req_done(req); - tevent_req_post(req, state->ev); - } else if (ret != EAGAIN) { + if (ret != EOK && ret != EAGAIN) { + DEBUG(SSSDBG_OP_FAILURE, ("Nested group processing failed\n")); return ret; + } else if (ret == EOK) { + DEBUG(SSSDBG_TRACE_FUNC, ("All done.\n")); + tevent_req_done(req); } - return EOK; } |