From 92ec40e6aa25f75903ffdb166a8ec56b67bfd77d Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Tue, 1 Dec 2015 15:27:41 +0100 Subject: SDAP: rename sdap_get_id_specific_filter More generic name is used now since it is not used only for id filters. Probably all references will be deleted when the code uses sdap_search_in_bases istead of custom search base iterators. Reviewed-by: Sumit Bose --- src/providers/ldap/sdap_async_initgroups.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'src/providers/ldap/sdap_async_initgroups.c') diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index 8d45c61ab..39b310a4e 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -493,9 +493,8 @@ static errno_t sdap_initgr_rfc2307_next_base(struct tevent_req *req) talloc_zfree(state->filter); - state->filter = sdap_get_id_specific_filter( - state, state->base_filter, - state->search_bases[state->base_iter]->filter); + state->filter = sdap_combine_filters( state, state->base_filter, + state->search_bases[state->base_iter]->filter); if (!state->filter) { return ENOMEM; } @@ -1667,10 +1666,8 @@ static errno_t sdap_initgr_rfc2307bis_next_base(struct tevent_req *req) state = tevent_req_data(req, struct sdap_initgr_rfc2307bis_state); talloc_zfree(state->filter); - state->filter = sdap_get_id_specific_filter( - state, - state->base_filter, - state->search_bases[state->base_iter]->filter); + state->filter = sdap_combine_filters(state, state->base_filter, + state->search_bases[state->base_iter]->filter); if (!state->filter) { return ENOMEM; } @@ -2430,9 +2427,8 @@ static errno_t rfc2307bis_nested_groups_next_base(struct tevent_req *req) state = tevent_req_data(req, struct sdap_rfc2307bis_nested_ctx); talloc_zfree(state->filter); - state->filter = sdap_get_id_specific_filter( - state, state->base_filter, - state->search_bases[state->base_iter]->filter); + state->filter = sdap_combine_filters(state, state->base_filter, + state->search_bases[state->base_iter]->filter); if (!state->filter) { return ENOMEM; } @@ -2798,10 +2794,8 @@ static errno_t sdap_get_initgr_next_base(struct tevent_req *req) state = tevent_req_data(req, struct sdap_get_initgr_state); talloc_zfree(state->filter); - state->filter = sdap_get_id_specific_filter( - state, - state->user_base_filter, - state->user_search_bases[state->user_base_iter]->filter); + state->filter = sdap_combine_filters(state, state->user_base_filter, + state->user_search_bases[state->user_base_iter]->filter); if (!state->filter) { return ENOMEM; } -- cgit