>From 5a28cf82146326cd45a63e57b0bbda2f4b2adfa9 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 24 Jun 2013 10:46:53 +0200 Subject: [PATCH] LDAP: Retry SID search based on result of LDAP search, not the return code --- src/providers/ldap/ldap_id.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index 1f3704d5bd3228ebd544d28c6c69ca54a7369c8d..d76a81a3eed3dedec410d8d4643f287e90d0cb0f 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -1472,14 +1472,25 @@ static void get_user_and_group_users_done(struct tevent_req *subreq) struct get_user_and_group_state); int ret; - ret = users_get_recv(subreq, &state->dp_error, NULL); + ret = users_get_recv(subreq, &state->dp_error, &state->sdap_ret); talloc_zfree(subreq); - if (ret == EOK) { /* Matching user found */ + if (ret != EOK) { /* Fatal error while looking up user */ + tevent_req_error(req, ret); + return; + } + + if (state->sdap_ret == EOK) { /* Matching user found */ tevent_req_done(req); return; + } else if (state->sdap_ret != ENOENT) { + tevent_req_error(req, EIO); + return; } + /* Now the search finished fine but did not find an entry. + * Retry with groups. */ + subreq = groups_get_send(req, state->ev, state->id_ctx, state->sdom, state->conn, state->filter_val, state->filter_type, -- 1.8.2.1