From 1f2fc55ecf7b5e170b2c0752304d1a2ecebc5259 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 8 May 2015 14:49:09 +0200 Subject: LDAP: Add sdap_lookup_type enum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related: https://fedorahosted.org/sssd/ticket/2553 Change the boolan parameter of sdap_get_users_send and sdap_get_groups_send to a tri-state that controls whether we expect only a single entry (ie don't use the paging control), multiple entries with a search limit (wildcard request) or multiple entries with no limit (enumeration). Reviewed-by: Pavel Březina --- src/providers/ldap/ldap_id.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/providers/ldap/ldap_id.c') diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index 61f09fc41..73840d288 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -396,12 +396,12 @@ static void users_get_search(struct tevent_req *req) struct users_get_state *state = tevent_req_data(req, struct users_get_state); struct tevent_req *subreq; - bool multiple_results; + enum sdap_entry_lookup_type lookup_type; if (state->filter_type == BE_FILTER_WILDCARD) { - multiple_results = true; + lookup_type = SDAP_LOOKUP_WILDCARD; } else { - multiple_results = false; + lookup_type = SDAP_LOOKUP_SINGLE; } subreq = sdap_get_users_send(state, state->ev, @@ -412,7 +412,7 @@ static void users_get_search(struct tevent_req *req) state->attrs, state->filter, dp_opt_get_int(state->ctx->opts->basic, SDAP_SEARCH_TIMEOUT), - multiple_results); + lookup_type); if (!subreq) { tevent_req_error(req, ENOMEM); return; @@ -901,12 +901,12 @@ static void groups_get_search(struct tevent_req *req) struct groups_get_state *state = tevent_req_data(req, struct groups_get_state); struct tevent_req *subreq; - bool multiple_results; + enum sdap_entry_lookup_type lookup_type; if (state->filter_type == BE_FILTER_WILDCARD) { - multiple_results = true; + lookup_type = SDAP_LOOKUP_WILDCARD; } else { - multiple_results = false; + lookup_type = SDAP_LOOKUP_SINGLE; } subreq = sdap_get_groups_send(state, state->ev, @@ -916,7 +916,7 @@ static void groups_get_search(struct tevent_req *req) state->attrs, state->filter, dp_opt_get_int(state->ctx->opts->basic, SDAP_SEARCH_TIMEOUT), - multiple_results, + lookup_type, state->no_members); if (!subreq) { tevent_req_error(req, ENOMEM); -- cgit