Refactor single domain initialization

Bring it out of sysdb, which will slowly remove internal dependencies on
domains and instead will always require them to be passed by callers.

2 files changed, 40 insertions, 0 deletions

diff --git a/src/util/domain_info_utils.c b/src/util/domain_info_utils.c
index a6aa5c733..cee11eb57 100644
--- a/src/util/domain_info_utils.c
+++ b/src/util/domain_info_utils.c
@@ -112,3 +112,37 @@ struct sss_domain_info *copy_subdomain(TALLOC_CTX *mem_ctx,
     return new_subdomain(mem_ctx, subdomain->parent, subdomain->name,
                          subdomain->flat_name, subdomain->domain_id);
 }
+
+errno_t sssd_domain_init(TALLOC_CTX *mem_ctx,
+                         struct confdb_ctx *cdb,
+                         const char *domain_name,
+                         const char *db_path,
+                         struct sss_domain_info **_domain)
+{
+    int ret;
+    struct sss_domain_info *dom;
+    struct sysdb_ctx *sysdb;
+
+    ret = confdb_get_domain(cdb, domain_name, &dom);
+    if (ret != EOK) {
+        DEBUG(SSSDBG_OP_FAILURE, ("Error retrieving domain configuration.\n"));
+        return ret;
+    }
+
+    if (dom->sysdb != NULL) {
+        DEBUG(SSSDBG_OP_FAILURE, ("Sysdb context already initialized.\n"));
+        return EEXIST;
+    }
+
+    ret = sysdb_domain_init(mem_ctx, dom, db_path, &sysdb);
+    if (ret != EOK) {
+        DEBUG(SSSDBG_OP_FAILURE, ("Error opening cache database.\n"));
+        return ret;
+    }
+
+    dom->sysdb = talloc_steal(dom, sysdb);
+
+    *_domain = dom;
+
+    return EOK;
+}
diff --git a/src/util/util.h b/src/util/util.h
index cc5a2bafb..df1ee3b08 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -574,6 +574,12 @@ struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx,
 struct sss_domain_info *copy_subdomain(TALLOC_CTX *mem_ctx,
                                        struct sss_domain_info *subdomain);
 
+errno_t sssd_domain_init(TALLOC_CTX *mem_ctx,
+                         struct confdb_ctx *cdb,
+                         const char *domain_name,
+                         const char *db_path,
+                         struct sss_domain_info **_domain);
+
 /* from util_lock.c */
 errno_t sss_br_lock_file(int fd, size_t start, size_t len,
                          int num_tries, useconds_t wait);