diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2011-10-28 17:03:03 +0200 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-10-31 08:04:31 -0400 |
commit | f7e736e233875dd46c3edfe04340b17d78dc1c98 (patch) | |
tree | 88a2fdcf8e78a33427d5f40db191d0d24e23b40f | |
parent | f5379d2cd137c4667ec3e0047ba9b96fe4edf161 (diff) | |
download | sssd_unused-f7e736e233875dd46c3edfe04340b17d78dc1c98.tar.gz sssd_unused-f7e736e233875dd46c3edfe04340b17d78dc1c98.tar.xz sssd_unused-f7e736e233875dd46c3edfe04340b17d78dc1c98.zip |
RFC2307bis initgroups: fix nested groups processing
Due to incorrectly written loop, SSSD would go into infitite loop if it
processed the same group on two different levels of membership.
-rw-r--r-- | src/providers/ldap/sdap_async_accounts.c | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/src/providers/ldap/sdap_async_accounts.c b/src/providers/ldap/sdap_async_accounts.c index 6f1e5281..e6027f85 100644 --- a/src/providers/ldap/sdap_async_accounts.c +++ b/src/providers/ldap/sdap_async_accounts.c @@ -5558,17 +5558,23 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq) * Move on to the next group */ state->group_iter++; - if (state->group_iter < state->num_groups) { - do { - ret = rfc2307bis_nested_groups_step(req); - if (ret != EOK && ret != EAGAIN) { - tevent_req_error(req, ret); - return; - } - } while (ret == EOK); + while (state->group_iter < state->num_groups) { + ret = rfc2307bis_nested_groups_step(req); + if (ret == EAGAIN) { + /* Looking up parent groups.. */ + return; + } else if (ret != EOK) { + tevent_req_error(req, ret); + return; + } + /* EOK means this group has already been processed - * in another level */ - } else { + * in another nesting level */ + state->group_iter++; + } + + if (state->group_iter == state->num_groups) { + /* All groups processed. Done. */ tevent_req_done(req); } return; @@ -5613,18 +5619,25 @@ static void rfc2307bis_nested_groups_done(struct tevent_req *subreq) } state->group_iter++; - if (state->group_iter < state->num_groups) { - do { - ret = rfc2307bis_nested_groups_step(req); - if (ret != EOK && ret != EAGAIN) { - tevent_req_error(req, ret); - return; - } - } while (ret == EOK); + while (state->group_iter < state->num_groups) { + ret = rfc2307bis_nested_groups_step(req); + if (ret == EAGAIN) { + /* Looking up parent groups.. */ + return; + } else if (ret != EOK) { + tevent_req_error(req, ret); + return; + } + /* EOK means this group has already been processed - * in another level */ - } else { + * in another nesting level */ + state->group_iter++; + } + + if (state->group_iter == state->num_groups) { + /* All groups processed. Done. */ tevent_req_done(req); + return; } } |