66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
From 5e47ae51f5cf11decdfec483ab1adef07ec2b7ef Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com>
|
|
Date: Wed, 4 Apr 2018 12:17:37 +0200
|
|
Subject: [PATCH] GPO: Add ad_options to ad_gpo_process_som_state
|
|
|
|
We will need at least ad_site option from this
|
|
context available to get the AD site override
|
|
value.
|
|
|
|
Resolves:
|
|
https://pagure.io/SSSD/sssd/issue/3646
|
|
|
|
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
(cherry picked from commit 7a42831b208ed8d2fcb9d8beaa12bd2214bb7dce)
|
|
---
|
|
src/providers/ad/ad_gpo.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/src/providers/ad/ad_gpo.c b/src/providers/ad/ad_gpo.c
|
|
index d9ea31141..028f6a2e7 100644
|
|
--- a/src/providers/ad/ad_gpo.c
|
|
+++ b/src/providers/ad/ad_gpo.c
|
|
@@ -146,6 +146,7 @@ struct tevent_req *ad_gpo_process_som_send(TALLOC_CTX *mem_ctx,
|
|
struct ldb_context *ldb_ctx,
|
|
struct sdap_id_op *sdap_op,
|
|
struct sdap_options *opts,
|
|
+ struct dp_option *ad_options,
|
|
int timeout,
|
|
const char *target_dn,
|
|
const char *domain_name);
|
|
@@ -1975,6 +1976,7 @@ ad_gpo_target_dn_retrieval_done(struct tevent_req *subreq)
|
|
state->ldb_ctx,
|
|
state->sdap_op,
|
|
state->opts,
|
|
+ state->access_ctx->ad_options,
|
|
state->timeout,
|
|
state->target_dn,
|
|
state->host_domain->name);
|
|
@@ -2701,6 +2703,7 @@ struct ad_gpo_process_som_state {
|
|
struct tevent_context *ev;
|
|
struct sdap_id_op *sdap_op;
|
|
struct sdap_options *opts;
|
|
+ struct dp_option *ad_options;
|
|
int timeout;
|
|
bool allow_enforced_only;
|
|
char *site_name;
|
|
@@ -2734,6 +2737,7 @@ ad_gpo_process_som_send(TALLOC_CTX *mem_ctx,
|
|
struct ldb_context *ldb_ctx,
|
|
struct sdap_id_op *sdap_op,
|
|
struct sdap_options *opts,
|
|
+ struct dp_option *ad_options,
|
|
int timeout,
|
|
const char *target_dn,
|
|
const char *domain_name)
|
|
@@ -2752,6 +2756,7 @@ ad_gpo_process_som_send(TALLOC_CTX *mem_ctx,
|
|
state->ev = ev;
|
|
state->sdap_op = sdap_op;
|
|
state->opts = opts;
|
|
+ state->ad_options = ad_options;
|
|
state->timeout = timeout;
|
|
state->som_index = 0;
|
|
state->allow_enforced_only = 0;
|
|
--
|
|
2.14.3
|
|
|