diff options
Diffstat (limited to 'src/providers/ipa')
| -rw-r--r-- | src/providers/ipa/ipa_common.c | 21 | ||||
| -rw-r--r-- | src/providers/ipa/ipa_netgroups.c | 10 |
2 files changed, 19 insertions, 12 deletions
diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index ec36b57d7..76da6c1e1 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -187,6 +187,13 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } + ret = sdap_domain_add(ipa_opts->id, + ipa_opts->id_ctx->sdap_id_ctx->be->domain, + NULL); + if (ret != EOK) { + goto done; + } + /* get sdap options */ ret = dp_get_options(ipa_opts->id, cdb, conf_path, ipa_def_ldap_opts, @@ -223,7 +230,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_SEARCH_BASE, - &ipa_opts->id->search_bases); + &ipa_opts->id->sdom->search_bases); if (ret != EOK) goto done; /* set krb realm */ @@ -277,7 +284,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_USER_SEARCH_BASE, - &ipa_opts->id->user_search_bases); + &ipa_opts->id->sdom->user_search_bases); if (ret != EOK) goto done; if (NULL == dp_opt_get_string(ipa_opts->id->basic, @@ -296,7 +303,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_GROUP_SEARCH_BASE, - &ipa_opts->id->group_search_bases); + &ipa_opts->id->sdom->group_search_bases); if (ret != EOK) goto done; if (NULL == dp_opt_get_string(ipa_opts->id->basic, @@ -334,7 +341,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_SUDO_SEARCH_BASE, - &ipa_opts->id->sudo_search_bases); + &ipa_opts->id->sdom->sudo_search_bases); if (ret != EOK) goto done; if (NULL == dp_opt_get_string(ipa_opts->id->basic, @@ -357,7 +364,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_NETGROUP_SEARCH_BASE, - &ipa_opts->id->netgroup_search_bases); + &ipa_opts->id->sdom->netgroup_search_bases); if (ret != EOK) goto done; if (NULL == dp_opt_get_string(ipa_opts->basic, @@ -450,7 +457,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_SERVICE_SEARCH_BASE, - &ipa_opts->id->service_search_bases); + &ipa_opts->id->sdom->service_search_bases); if (ret != EOK) goto done; if (NULL == dp_opt_get_string(ipa_opts->basic, @@ -992,7 +999,7 @@ int ipa_get_autofs_options(struct ipa_options *ipa_opts, ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_AUTOFS_SEARCH_BASE, - &ipa_opts->id->autofs_search_bases); + &ipa_opts->id->sdom->autofs_search_bases); if (ret != EOK && ret != ENOENT) { DEBUG(SSSDBG_OP_FAILURE, ("Could not parse autofs search base\n")); goto done; diff --git a/src/providers/ipa/ipa_netgroups.c b/src/providers/ipa/ipa_netgroups.c index f9e43b87f..0f36fc9f5 100644 --- a/src/providers/ipa/ipa_netgroups.c +++ b/src/providers/ipa/ipa_netgroups.c @@ -215,7 +215,7 @@ struct tevent_req *ipa_get_netgroups_send(TALLOC_CTX *memctx, state->netgr_base_iter = 0; state->dom = dom; - if (!ipa_options->id->netgroup_search_bases) { + if (!ipa_options->id->sdom->netgroup_search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, ("Netgroup lookup request without a search base\n")); ret = EINVAL; @@ -248,7 +248,7 @@ static errno_t ipa_netgr_next_base(struct tevent_req *req) struct sdap_search_base **netgr_bases; state = tevent_req_data(req, struct ipa_get_netgroups_state); - netgr_bases = state->ipa_opts->id->netgroup_search_bases; + netgr_bases = state->ipa_opts->id->sdom->netgroup_search_bases; talloc_zfree(state->filter); state->filter = sdap_get_id_specific_filter( @@ -307,7 +307,7 @@ static void ipa_get_netgroups_process(struct tevent_req *subreq) hash_key_t key; hash_value_t value; - netgr_bases = state->ipa_opts->id->netgroup_search_bases; + netgr_bases = state->ipa_opts->id->sdom->netgroup_search_bases; ret = sdap_get_generic_recv(subreq, state, &netgroups_count, &netgroups); talloc_zfree(subreq); @@ -432,7 +432,7 @@ static int ipa_netgr_fetch_netgroups(struct ipa_get_netgroups_state *state, struct tevent_req *subreq; struct sdap_search_base **bases; - bases = state->ipa_opts->id->netgroup_search_bases; + bases = state->ipa_opts->id->sdom->netgroup_search_bases; if (bases[state->netgr_base_iter] == NULL) { /* No more bases to try */ return ENOENT; @@ -473,7 +473,7 @@ static int ipa_netgr_fetch_users(struct ipa_get_netgroups_state *state, struct tevent_req *subreq; struct sdap_search_base **bases; - bases = state->ipa_opts->id->user_search_bases; + bases = state->ipa_opts->id->sdom->user_search_bases; if (bases[state->user_base_iter] == NULL) { return ENOENT; } |