Regroup database rleated functions under db and

rename everything with the sysdb suffix.

5 files changed, 11 insertions, 475 deletions

diff --git a/server/providers/data_provider.c b/server/providers/data_provider.c
index ee449a525..e0de4dbbe 100644
--- a/server/providers/data_provider.c
+++ b/server/providers/data_provider.c
@@ -30,8 +30,6 @@
 #include <sys/time.h>
 #include <errno.h>
 #include "popt.h"
-#include "ldb.h"
-#include "ldb_errors.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
 #include "dbus/dbus.h"
@@ -47,7 +45,6 @@ struct dp_frontend;
 struct dp_ctx {
     struct event_context *ev;
     struct confdb_ctx *cdb;
-    struct ldb_context *ldb;
     struct service_sbus_ctx *ss_ctx;
     struct sbus_srv_ctx *sbus_srv;
     struct dp_backend *be_list;
@@ -165,50 +162,6 @@ static int dp_monitor_init(struct dp_ctx *dpctx)
     return EOK;
 }
 
-static int dp_db_init(struct dp_ctx *dpctx)
-{
-    TALLOC_CTX *ctx;
-    char *ldb_file;
-    char *default_db_file;
-    int ret;
-
-    ctx = talloc_new(dpctx);
-    if(ctx == NULL) {
-        return ENOMEM;
-    }
-
-    default_db_file = talloc_asprintf(ctx, "%s/%s", DB_PATH, DATA_PROVIDER_DB_FILE);
-    if (default_db_file == NULL) {
-        talloc_free(ctx);
-        return ENOMEM;
-    }
-
-    ret = confdb_get_string(dpctx->cdb, ctx,
-                            DATA_PROVIDER_DB_CONF_SEC, "ldbFile",
-                            default_db_file, &ldb_file);
-    if (ret != EOK) {
-        talloc_free(ctx);
-        return ret;
-    }
-
-    dpctx->ldb = ldb_init(ctx, dpctx->ev);
-    if (!dpctx->ldb) {
-        talloc_free(ctx);
-        return EIO;
-    }
-
-    ret = ldb_connect(dpctx->ldb, ldb_file, 0, NULL);
-    if (ret != LDB_SUCCESS) {
-        talloc_free(ctx);
-        return EIO;
-    }
-
-    talloc_steal(dpctx,dpctx->ldb);
-    talloc_free(ctx);
-
-    return EOK;
-}
-
 static void be_identity_check(DBusPendingCall *pending, void *data);
 static void be_online_check(DBusPendingCall *pending, void *data);
 static void be_got_account_info(DBusPendingCall *pending, void *data);
@@ -831,12 +784,6 @@ static int dp_process_init(TALLOC_CTX *mem_ctx,
     dpctx->ev = ev;
     dpctx->cdb = cdb;
 
-    ret = dp_db_init(dpctx);
-    if (ret != EOK) {
-        DEBUG(0, ("fatal error opening database\n"));
-        return ret;
-    }
-
     ret = dp_monitor_init(dpctx);
     if (ret != EOK) {
         DEBUG(0, ("fatal error setting up monitor bus\n"));
diff --git a/server/providers/data_provider_be.c b/server/providers/data_provider_be.c
index 8f0d8318a..75e99bdc5 100644
--- a/server/providers/data_provider_be.c
+++ b/server/providers/data_provider_be.c
@@ -30,10 +30,9 @@
 #include <sys/time.h>
 #include <errno.h>
 #include "popt.h"
-#include "ldb.h"
-#include "ldb_errors.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
+#include "db/sysdb.h"
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus_interfaces.h"
@@ -408,7 +407,7 @@ int be_process_init(TALLOC_CTX *mem_ctx,
         return ENOMEM;
     }
 
-    ret = dp_be_cachedb_init(ctx);
+    ret = sysdb_init(ctx, ev, cdb, &ctx->sysdb);
     if (ret != EOK) {
         DEBUG(0, ("fatal error opening cache database\n"));
         return ret;
diff --git a/server/providers/dp_backend.h b/server/providers/dp_backend.h
index 1ad31d5ec..219df957c 100644
--- a/server/providers/dp_backend.h
+++ b/server/providers/dp_backend.h
@@ -23,13 +23,14 @@
 #define __DP_BACKEND_H__
 
 #include "providers/data_provider.h"
+#include "db/sysdb.h"
 
 struct be_mod_ops;
 
 struct be_ctx {
     struct event_context *ev;
     struct confdb_ctx *cdb;
-    struct ldb_context *ldb;
+    struct sysdb_ctx *sysdb;
     struct service_sbus_ctx *ss_ctx;
     struct service_sbus_ctx *dp_ctx;
     const char *name;
@@ -47,13 +48,4 @@ struct be_mod_ops {
                             int filter_type, char *filter_value);
 };
 
-int dp_be_store_account_posix(struct be_ctx *ctx,
-                              char *name, char *pwd,
-                              uint64_t uid, uint64_t gid,
-                              char *gecos, char *homedir, char *shell);
-int dp_be_remove_account_posix(struct be_ctx *ctx, char *name);
-int dp_be_remove_account_posix_by_uid(struct be_ctx *ctx, uid_t uid);
-
-int dp_be_cachedb_init(struct be_ctx *ctx);
-
 #endif /* __DP_BACKEND_H___ */
diff --git a/server/providers/dp_backend_store.c b/server/providers/dp_backend_store.c
index 0d7153c15..6c97951e3 100644
--- a/server/providers/dp_backend_store.c
+++ b/server/providers/dp_backend_store.c
@@ -33,408 +33,3 @@
  * In case this changes (ex. plugins that contact the network etc..
  * make sure to split functions in multiple async calls */
 
-int dp_be_store_account_posix(struct be_ctx *ctx,
-                              char *name, char *pwd,
-                              uint64_t uid, uint64_t gid,
-                              char *gecos, char *homedir, char *shell)
-{
-    TALLOC_CTX *tmp_ctx;
-    const char *attrs[] = { NSS_PW_NAME, NULL };
-    struct ldb_dn *account_dn;
-    struct ldb_message *msg;
-    struct ldb_request *req;
-	struct ldb_result *res;
-    int lret, ret;
-    int flags;
-
-    tmp_ctx = talloc_new(ctx);
-    if (!tmp_ctx) {
-        return ENOMEM;
-    }
-
-    account_dn = ldb_dn_new_fmt(tmp_ctx, ctx->ldb,
-                                "uid=%s,"NSS_TMPL_USER_BASE,
-                                name, ctx->domain);
-    if (!account_dn) {
-        talloc_free(tmp_ctx);
-        return ENOMEM;
-    }
-
-    lret = ldb_transaction_start(ctx->ldb);
-    if (lret != LDB_SUCCESS) {
-        DEBUG(1, ("Failed ldb transaction start !? (%d)\n", lret));
-        ret = EIO;
-        goto done;
-    }
-
-    lret = ldb_search(ctx->ldb, tmp_ctx, &res, account_dn,
-                      LDB_SCOPE_BASE, attrs, NSS_PWENT_FILTER);
-    if (lret != LDB_SUCCESS) {
-        DEBUG(1, ("Failed to make search request: %s(%d)[%s]\n",
-                  ldb_strerror(lret), lret, ldb_errstring(ctx->ldb)));
-        ret = EIO;
-        goto done;
-    }
-
-    req = NULL;
-
-    msg = ldb_msg_new(tmp_ctx);
-    if (!msg) {
-        ret = ENOMEM;
-        goto done;
-    }
-    msg->dn = account_dn;
-
-    switch (res->count) {
-    case 0:
-        flags = LDB_FLAG_MOD_ADD;
-        break;
-    case 1:
-        flags = LDB_FLAG_MOD_REPLACE;
-        break;
-    default:
-        DEBUG(0, ("Cache DB corrupted, base search returned %d results\n",
-                  res->count));
-        ret = EIO;
-        goto done;
-    }
-
-    talloc_free(res);
-    res = NULL;
-
-    if (flags == LDB_FLAG_MOD_ADD) {
-        /* TODO: retrieve user objectclass list from configuration */
-        lret = ldb_msg_add_empty(msg, "objectClass", flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_string(msg, "objectClass", "user");
-        }
-        if (lret != LDB_SUCCESS) {
-            ret = errno;
-            goto done;
-        }
-
-        /* TODO: retrieve user name attribute from configuration */
-        lret = ldb_msg_add_empty(msg, NSS_PW_NAME, flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_string(msg, NSS_PW_NAME, name);
-        }
-        if (lret != LDB_SUCCESS) {
-            ret = errno;
-            goto done;
-        }
-    }
-
-    /* TODO: retrieve attribute name mappings from configuration */
-
-    /* pwd */
-    if (pwd && *pwd) {
-        lret = ldb_msg_add_empty(msg, NSS_PW_PWD, flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_string(msg, NSS_PW_PWD, pwd);
-        }
-    } else {
-        lret = ldb_msg_add_empty(msg, NSS_PW_PWD,
-                                 LDB_FLAG_MOD_DELETE, NULL);
-    }
-    if (lret != LDB_SUCCESS) {
-        ret = errno;
-        goto done;
-    }
-
-    /* uid */
-    if (uid) {
-        lret = ldb_msg_add_empty(msg, NSS_PW_UIDNUM, flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_fmt(msg, NSS_PW_UIDNUM,
-                                   "%lu", (unsigned long)uid);
-        }
-        if (lret != LDB_SUCCESS) {
-            ret = errno;
-            goto done;
-        }
-    } else {
-        DEBUG(0, ("Cached users can't have UID == 0\n"));
-        ret = EINVAL;
-        goto done;
-    }
-
-    /* gid */
-    if (gid) {
-        lret = ldb_msg_add_empty(msg, NSS_PW_GIDNUM, flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_fmt(msg, NSS_PW_GIDNUM,
-                                   "%lu", (unsigned long)gid);
-        }
-        if (lret != LDB_SUCCESS) {
-            ret = errno;
-            goto done;
-        }
-    } else {
-        DEBUG(0, ("Cached users can't have GID == 0\n"));
-        ret = EINVAL;
-        goto done;
-    }
-
-    /* gecos */
-    if (gecos && *gecos) {
-        lret = ldb_msg_add_empty(msg, NSS_PW_FULLNAME, flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_string(msg, NSS_PW_FULLNAME, gecos);
-        }
-    } else {
-        lret = ldb_msg_add_empty(msg, NSS_PW_FULLNAME,
-                                 LDB_FLAG_MOD_DELETE, NULL);
-    }
-    if (lret != LDB_SUCCESS) {
-        ret = errno;
-        goto done;
-    }
-
-    /* homedir */
-    if (homedir && *homedir) {
-        lret = ldb_msg_add_empty(msg, NSS_PW_HOMEDIR, flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_string(msg, NSS_PW_HOMEDIR, homedir);
-        }
-    } else {
-        lret = ldb_msg_add_empty(msg, NSS_PW_HOMEDIR,
-                                 LDB_FLAG_MOD_DELETE, NULL);
-    }
-    if (lret != LDB_SUCCESS) {
-        ret = errno;
-        goto done;
-    }
-
-    /* shell */
-    if (shell && *shell) {
-        lret = ldb_msg_add_empty(msg, NSS_PW_SHELL, flags, NULL);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_msg_add_string(msg, NSS_PW_SHELL, shell);
-        }
-    } else {
-        lret = ldb_msg_add_empty(msg, NSS_PW_SHELL,
-                                 LDB_FLAG_MOD_DELETE, NULL);
-    }
-    if (lret != LDB_SUCCESS) {
-        ret = errno;
-        goto done;
-    }
-
-    /* modification time */
-    lret = ldb_msg_add_empty(msg, NSS_LAST_UPDATE, flags, NULL);
-    if (lret == LDB_SUCCESS) {
-        lret = ldb_msg_add_fmt(msg, NSS_LAST_UPDATE,
-                               "%ld", (long int)time(NULL));
-    }
-    if (lret != LDB_SUCCESS) {
-        ret = errno;
-        goto done;
-    }
-
-    if (flags == LDB_FLAG_MOD_ADD) {
-        lret = ldb_build_add_req(&req, ctx->ldb, tmp_ctx, msg, NULL,
-                                 NULL, ldb_op_default_callback, NULL);
-    } else {
-        lret = ldb_build_mod_req(&req, ctx->ldb, tmp_ctx, msg, NULL,
-                                 NULL, ldb_op_default_callback, NULL);
-    }
-    if (lret == LDB_SUCCESS) {
-        lret = ldb_request(ctx->ldb, req);
-        if (lret == LDB_SUCCESS) {
-            lret = ldb_wait(req->handle, LDB_WAIT_ALL);
-        }
-    }
-    if (lret != LDB_SUCCESS) {
-        DEBUG(1, ("Failed to make modify request: %s(%d)[%s]\n",
-                  ldb_strerror(lret), lret, ldb_errstring(ctx->ldb)));
-        ret = EIO;
-        goto done;
-    }
-
-    lret = ldb_transaction_commit(ctx->ldb);
-    if (lret != LDB_SUCCESS) {
-        DEBUG(1, ("Failed ldb transaction start !? (%d)\n", lret));
-        ret = EIO;
-        goto done;
-    }
-
-    ret = EOK;
-
-done:
-    if (ret != EOK) {
-        lret = ldb_transaction_cancel(ctx->ldb);
-        if (lret != LDB_SUCCESS) {
-            DEBUG(1, ("Failed to cancel ldb transaction (%d)\n", lret));
-        }
-    }
-
-    talloc_free(tmp_ctx);
-    return ret;
-}
-
-int dp_be_remove_account_posix(struct be_ctx *ctx, char *name)
-{
-    TALLOC_CTX *tmp_ctx;
-    struct ldb_dn *account_dn;
-    int ret;
-
-    tmp_ctx = talloc_new(ctx);
-    if (!tmp_ctx) {
-        return ENOMEM;
-    }
-
-    account_dn = ldb_dn_new_fmt(tmp_ctx, ctx->ldb,
-                                "uid=%s,"NSS_TMPL_USER_BASE,
-                                name, ctx->domain);
-    if (!account_dn) {
-        talloc_free(tmp_ctx);
-        return ENOMEM;
-    }
-
-    ret = ldb_delete(ctx->ldb, account_dn);
-
-    if (ret != LDB_SUCCESS) {
-        DEBUG(2, ("LDB Error: %s(%d)\nError Message: [%s]\n",
-              ldb_strerror(ret), ret, ldb_errstring(ctx->ldb)));
-        ret = EIO;
-    }
-
-    talloc_free(tmp_ctx);
-    return ret;
-}
-
-int dp_be_remove_account_posix_by_uid(struct be_ctx *ctx, uid_t uid)
-{
-    TALLOC_CTX *tmp_ctx;
-    const char *attrs[] = { NSS_PW_NAME, NSS_PW_UIDNUM, NULL };
-    struct ldb_dn *base_dn;
-    struct ldb_dn *account_dn;
-	struct ldb_result *res;
-    int lret, ret;
-
-    tmp_ctx = talloc_new(ctx);
-    if (!tmp_ctx) {
-        return ENOMEM;
-    }
-
-    base_dn = ldb_dn_new_fmt(tmp_ctx, ctx->ldb,
-                             NSS_TMPL_USER_BASE, ctx->domain);
-    if (!base_dn) {
-        talloc_free(tmp_ctx);
-        return ENOMEM;
-    }
-
-    lret = ldb_transaction_start(ctx->ldb);
-    if (lret != LDB_SUCCESS) {
-        DEBUG(1, ("Failed ldb transaction start !? (%d)\n", lret));
-        ret = EIO;
-        goto done;
-    }
-
-    lret = ldb_search(ctx->ldb, tmp_ctx, &res, base_dn,
-                      LDB_SCOPE_BASE, attrs,
-                      NSS_PWUID_FILTER,
-                      (unsigned long)uid);
-    if (lret != LDB_SUCCESS) {
-        DEBUG(1, ("Failed to make search request: %s(%d)[%s]\n",
-                  ldb_strerror(lret), lret, ldb_errstring(ctx->ldb)));
-        ret = EIO;
-        goto done;
-    }
-
-    if (res->count == 0) {
-        ret = EOK;
-        goto done;
-    }
-    if (res->count > 1) {
-        DEBUG(0, ("Cache DB corrupted, base search returned %d results\n",
-                  res->count));
-        ret = EOK;
-        goto done;
-    }
-
-    account_dn = ldb_dn_copy(tmp_ctx, res->msgs[0]->dn);
-    if (!account_dn) {
-        ret = ENOMEM;
-        goto done;
-    }
-
-    talloc_free(res);
-    res = NULL;
-
-    ret = ldb_delete(ctx->ldb, account_dn);
-
-    if (ret != LDB_SUCCESS) {
-        DEBUG(2, ("LDB Error: %s(%d)\nError Message: [%s]\n",
-              ldb_strerror(ret), ret, ldb_errstring(ctx->ldb)));
-        ret = EIO;
-        goto done;
-    }
-
-    lret = ldb_transaction_commit(ctx->ldb);
-    if (lret != LDB_SUCCESS) {
-        DEBUG(1, ("Failed ldb transaction commit !! (%d)\n", lret));
-        ret = EIO;
-        goto done;
-    }
-
-    ret = EOK;
-
-done:
-    if (ret != EOK) {
-        lret = ldb_transaction_cancel(ctx->ldb);
-        if (lret != LDB_SUCCESS) {
-            DEBUG(1, ("Failed to cancel ldb transaction (%d)\n", lret));
-        }
-    }
-
-    talloc_free(tmp_ctx);
-    return ret;
-}
-
-/* TODO: Unify with nss_ldb and provide a single cachedb interface */
-
-int dp_be_cachedb_init(struct be_ctx *ctx)
-{
-    TALLOC_CTX *tmp_ctx;
-    char *ldb_file;
-    char *default_db_file;
-    int ret;
-
-    tmp_ctx = talloc_new(ctx);
-    if (!tmp_ctx) {
-        return ENOMEM;
-    }
-
-    default_db_file = talloc_asprintf(tmp_ctx, "%s/%s", DB_PATH, DATA_PROVIDER_DB_FILE);
-    if (!default_db_file) {
-        talloc_free(tmp_ctx);
-        return ENOMEM;
-    }
-
-    ret = confdb_get_string(ctx->cdb, tmp_ctx,
-                            DATA_PROVIDER_DB_CONF_SEC, "ldbFile",
-                            default_db_file, &ldb_file);
-    if (ret != EOK) {
-        talloc_free(tmp_ctx);
-        return ret;
-    }
-
-    ctx->ldb = ldb_init(tmp_ctx, ctx->ev);
-    if (!ctx->ldb) {
-        talloc_free(tmp_ctx);
-        return EIO;
-    }
-
-    ret = ldb_connect(ctx->ldb, ldb_file, 0, NULL);
-    if (ret != LDB_SUCCESS) {
-        talloc_free(tmp_ctx);
-        return EIO;
-    }
-
-    talloc_steal(ctx, ctx->ldb);
-
-    talloc_free(tmp_ctx);
-    return EOK;
-}
-
diff --git a/server/providers/proxy.c b/server/providers/proxy.c
index f93a5ede1..04d4a58a8 100644
--- a/server/providers/proxy.c
+++ b/server/providers/proxy.c
@@ -25,6 +25,7 @@
 #include <grp.h>
 #include "util/util.h"
 #include "providers/dp_backend.h"
+#include "db/sysdb.h"
 
 struct proxy_nss_ops {
     enum nss_status (*getpwnam_r)(const char *name, struct passwd *result,
@@ -69,10 +70,11 @@ static int get_pw_name(struct be_ctx *be_ctx, struct proxy_ctx *proxy_ctx, char
 
     switch (status) {
     case NSS_STATUS_NOTFOUND:
-        ret = dp_be_remove_account_posix(be_ctx, name);
+        ret = sysdb_remove_account_posix(be_ctx, be_ctx->sysdb,
+                                         be_ctx->domain, name);
         break;
     case NSS_STATUS_SUCCESS:
-        ret = dp_be_store_account_posix(be_ctx,
+        ret = sysdb_store_account_posix(be_ctx, be_ctx->sysdb, be_ctx->domain,
                                         result.pw_name, result.pw_passwd,
                                         result.pw_uid, result.pw_gid,
                                         result.pw_gecos, result.pw_dir,
@@ -109,10 +111,11 @@ static int get_pw_uid(struct be_ctx *be_ctx, struct proxy_ctx *proxy_ctx, uid_t
 
     switch (status) {
     case NSS_STATUS_NOTFOUND:
-        ret = dp_be_remove_account_posix_by_uid(be_ctx, uid);
+        ret = sysdb_remove_account_posix_by_uid(be_ctx, be_ctx->sysdb,
+                                                be_ctx->domain,uid);
         break;
     case NSS_STATUS_SUCCESS:
-        ret = dp_be_store_account_posix(be_ctx,
+        ret = sysdb_store_account_posix(be_ctx, be_ctx->sysdb, be_ctx->domain,
                                         result.pw_name, result.pw_passwd,
                                         result.pw_uid, result.pw_gid,
                                         result.pw_gecos, result.pw_dir,