From e98bdad5a1f6f1c9dccbabc0751c1d4cf270e0f3 Mon Sep 17 00:00:00 2001 From: Justin Stephenson Date: Wed, 10 Jan 2024 09:24:22 -0500 Subject: [PATCH 16/18] ipa: Add BUILD_PASSKEY conditional for passkey codepath --- Makefile.am | 3 ++- src/providers/ipa/ipa_subdomains.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3e36ec9f7..e5271c4a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4568,9 +4568,10 @@ if BUILD_SSH libsss_ipa_la_SOURCES += src/providers/ipa/ipa_hostid.c endif +if BUILD_PASSKEY libsss_ipa_la_SOURCES += \ src/providers/ipa/ipa_subdomains_passkey.c - +endif libsss_ad_la_SOURCES = \ src/providers/ad/ad_opts.c \ diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c index 34cedc036..e19343a77 100644 --- a/src/providers/ipa/ipa_subdomains.c +++ b/src/providers/ipa/ipa_subdomains.c @@ -30,7 +30,9 @@ #include "providers/ipa/ipa_id.h" #include "providers/ipa/ipa_opts.h" #include "providers/ipa/ipa_config.h" +#ifdef BUILD_PASSKEY #include "providers/ipa/ipa_subdomains_passkey.h" +#endif /* BUILD_PASSKEY */ #include @@ -2762,6 +2764,7 @@ static void ipa_subdomains_refresh_certmap_done(struct tevent_req *subreq) /* Not good, but let's try to continue with other server side options */ } +#ifdef BUILD_PASSKEY subreq = ipa_subdomains_passkey_send(state, state->ev, state->sd_ctx, sdap_id_op_handle(state->sdap_op)); if (subreq == NULL) { @@ -2792,6 +2795,7 @@ static void ipa_subdomains_refresh_passkey_done(struct tevent_req *subreq) DEBUG(SSSDBG_IMPORTANT_INFO, "Passkey feature is not configured " "on IPA server"); } +#endif /* BUILD_PASSKEY */ subreq = ipa_subdomains_master_send(state, state->ev, state->sd_ctx, sdap_id_op_handle(state->sdap_op)); -- 2.41.0