diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2013-05-27 08:48:02 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-06-07 00:14:13 +0200 |
| commit | 749cfb5d3270b5daf389d51a0dbd3fd2aec6e05d (patch) | |
| tree | 65abb8438d2d31bd627861ff2fdc8cda6c07c960 /src/providers/ipa/ipa_common.c | |
| parent | 9aa117a93e315f790a1922d9ac7bd484878b621e (diff) | |
| download | sssd-749cfb5d3270b5daf389d51a0dbd3fd2aec6e05d.tar.gz sssd-749cfb5d3270b5daf389d51a0dbd3fd2aec6e05d.tar.xz sssd-749cfb5d3270b5daf389d51a0dbd3fd2aec6e05d.zip | |
LDAP: new SDAP domain structure
Previously an sdap_id_ctx was always tied to one domain with a single
set of search bases. But with the introduction of Global Catalog
lookups, primary domain and subdomains might have different search
bases.
This patch introduces a new structure sdap_domain that contains an sssd
domain or subdomain and a set of search bases. With this patch, there is
only one sdap_domain that describes the primary domain.
Diffstat (limited to 'src/providers/ipa/ipa_common.c')
| -rw-r--r-- | src/providers/ipa/ipa_common.c | 21 |
1 files changed, 14 insertions, 7 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; |