From 880552cc45e55c7ef9f81423aff8fe867451d752 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Thu, 30 Nov 2017 11:47:30 +0100 Subject: [PATCH 69/83] LDAP: Extract the check whether to run a POSIX check to a function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will reduce the code duplication in the following patches and will allow to keep all the logic on one place so that when/if we change the code in the future, we only have to change the single place. Reviewed-by: Pavel Březina Reviewed-by: Sumit Bose (cherry picked from commit 8e93ebb2a6f7644c389c1d1f4e92a21c4d0b2b45) --- src/providers/ldap/ldap_common.c | 15 +++++++++++++++ src/providers/ldap/ldap_common.h | 4 ++++ src/providers/ldap/ldap_id.c | 15 ++++++--------- src/providers/ldap/sdap_async_enum.c | 7 +++---- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index 0597e91f7fade47aeb34565597c730ac406e0cfc..3eff3515d95043d4b59cb0d9953cf050355a0ca5 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -971,3 +971,18 @@ sdap_id_ctx_new(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, return sdap_ctx; } + +bool should_run_posix_check(struct sdap_id_ctx *ctx, + bool use_id_mapping, + bool posix_request) +{ + if (use_id_mapping == false && + posix_request == true && + ctx->opts->schema_type == SDAP_SCHEMA_AD && + ctx->srv_opts && + ctx->srv_opts->posix_checked == false) { + return true; + } + + return false; +} diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h index 0510b7d5ab5121bd96f699e8e59520a2a18a604f..fa7cda4df9d7334f6f0f5baccae0cba0478bfbea 100644 --- a/src/providers/ldap/ldap_common.h +++ b/src/providers/ldap/ldap_common.h @@ -304,6 +304,10 @@ char *get_enterprise_principal_string_filter(TALLOC_CTX *mem_ctx, const char *princ, struct dp_option *sdap_basic_opts); +bool should_run_posix_check(struct sdap_id_ctx *ctx, + bool id_mapping, + bool posix_request); + char *sdap_get_access_filter(TALLOC_CTX *mem_ctx, const char *base_filter); diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index e89fc6133316f684810afe4c1a0731b8a04f2931..6ab9e0aa1db3eed32deb75211ded30a4cb48ca30 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -411,11 +411,9 @@ static void users_get_connect_done(struct tevent_req *subreq) /* If POSIX attributes have been requested with an AD server and we * have no idea about POSIX attributes support, run a one-time check */ - if (state->use_id_mapping == false && - state->non_posix == false && - state->ctx->opts->schema_type == SDAP_SCHEMA_AD && - state->ctx->srv_opts && - state->ctx->srv_opts->posix_checked == false) { + if (should_run_posix_check(state->ctx, + state->use_id_mapping, + !state->non_posix)) { subreq = sdap_posix_check_send(state, state->ev, state->ctx->opts, sdap_id_op_handle(state->op), state->sdom->user_search_bases, @@ -958,10 +956,9 @@ static void groups_get_connect_done(struct tevent_req *subreq) /* If POSIX attributes have been requested with an AD server and we * have no idea about POSIX attributes support, run a one-time check */ - if (state->use_id_mapping == false && - state->ctx->opts->schema_type == SDAP_SCHEMA_AD && - state->ctx->srv_opts && - state->ctx->srv_opts->posix_checked == false) { + if (should_run_posix_check(state->ctx, + state->use_id_mapping, + !state->non_posix)) { subreq = sdap_posix_check_send(state, state->ev, state->ctx->opts, sdap_id_op_handle(state->op), state->sdom->user_search_bases, diff --git a/src/providers/ldap/sdap_async_enum.c b/src/providers/ldap/sdap_async_enum.c index 91e481c4e694126900c729e86d187fba355de0b8..2cef4eb886f982ba388a34955bdd38468fe68200 100644 --- a/src/providers/ldap/sdap_async_enum.c +++ b/src/providers/ldap/sdap_async_enum.c @@ -196,10 +196,9 @@ static void sdap_dom_enum_ex_get_users(struct tevent_req *subreq) /* If POSIX attributes have been requested with an AD server and we * have no idea about POSIX attributes support, run a one-time check */ - if (use_id_mapping == false && - state->ctx->opts->schema_type == SDAP_SCHEMA_AD && - state->ctx->srv_opts && - state->ctx->srv_opts->posix_checked == false) { + if (should_run_posix_check(state->ctx, + use_id_mapping, + true)) { subreq = sdap_posix_check_send(state, state->ev, state->ctx->opts, sdap_id_op_handle(state->user_op), state->sdom->user_search_bases, -- 2.14.3