diff options
| -rw-r--r-- | src/db/sysdb.h | 5 | ||||
| -rw-r--r-- | src/db/sysdb_subdomains.c | 20 | ||||
| -rw-r--r-- | src/util/domain_info_utils.c | 9 |
3 files changed, 2 insertions, 32 deletions
diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 25304289..6dd833bf 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -373,11 +373,6 @@ errno_t sysdb_update_subdomains(struct sysdb_ctx *sysdb, int num_subdoms, struct sysdb_subdom *subdoms); -errno_t sysdb_get_subdomain_context(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, - struct sss_domain_info *subdomain, - struct sysdb_ctx **subdomain_ctx); - errno_t sysdb_master_domain_get_info(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, struct sss_domain_info *domain, diff --git a/src/db/sysdb_subdomains.c b/src/db/sysdb_subdomains.c index 69806517..9b295d7e 100644 --- a/src/db/sysdb_subdomains.c +++ b/src/db/sysdb_subdomains.c @@ -547,23 +547,3 @@ done: talloc_free(tmp_ctx); return ret; } - -errno_t sysdb_get_subdomain_context(TALLOC_CTX *mem_ctx, - struct sysdb_ctx *sysdb, - struct sss_domain_info *subdomain, - struct sysdb_ctx **subdomain_ctx) -{ - struct sysdb_ctx *new_ctx; - - new_ctx = talloc_zero(mem_ctx, struct sysdb_ctx); - if (new_ctx == NULL) { - return ENOMEM; - } - - new_ctx->ldb = sysdb->ldb; - new_ctx->ldb_file = sysdb->ldb_file; - - *subdomain_ctx = new_ctx; - - return EOK; -} diff --git a/src/util/domain_info_utils.c b/src/util/domain_info_utils.c index 45b9f7b5..d0f709ec 100644 --- a/src/util/domain_info_utils.c +++ b/src/util/domain_info_utils.c @@ -28,8 +28,7 @@ struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx, const char *flat_name, const char *id) { - int ret; - struct sss_domain_info *dom = NULL; + struct sss_domain_info *dom; dom = talloc_zero(mem_ctx, struct sss_domain_info); if (dom == NULL) { @@ -94,11 +93,7 @@ struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx, DEBUG(SSSDBG_OP_FAILURE, ("Missing sysdb context in parent domain.\n")); goto fail; } - ret = sysdb_get_subdomain_context(dom, parent->sysdb, dom, &dom->sysdb); - if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_get_subdomain_context failed.\n")); - goto fail; - } + dom->sysdb = parent->sysdb; return dom; |