s3:idmap_tdb: use idmap_rw_new_mapping in idmap_tdb_new_mapping
[amitay/samba.git] / source3 / winbindd / idmap_tdb.c
index 9e66eed0c8882437d63d2335c5b724754afd7823..a41f6e9fe37f050c900e5981d6ef44d35f49ae48 100644 (file)
@@ -7,6 +7,7 @@
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    Copyright (C) Jeremy Allison 2006
    Copyright (C) Simo Sorce 2003-2006
+   Copyright (C) Michael Adam 2009-2010
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 #include "winbindd.h"
+#include "idmap_rw.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
+/* idmap version determines auto-conversion - this is the database
+   structure version specifier. */
+
+#define IDMAP_VERSION 2
+
+struct idmap_tdb_context {
+       struct db_context *db;
+       struct idmap_rw_ops *rw_ops;
+};
+
 /* High water mark keys */
 #define HWM_GROUP  "GROUP HWM"
 #define HWM_USER   "USER HWM"
 
-static struct idmap_tdb_state {
-
-       /* User and group id pool */
-       uid_t low_uid, high_uid;               /* Range of uids to allocate */
-       gid_t low_gid, high_gid;               /* Range of gids to allocate */
-
-} idmap_tdb_state;
+struct convert_fn_state {
+       struct db_context *db;
+       bool failed;
+};
 
 /*****************************************************************************
  For idmap conversion: convert one record to new format
  Ancient versions (eg 2.2.3a) of winbindd_idmap.tdb mapped DOMAINNAME/rid
  instead of the SID.
 *****************************************************************************/
-static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state)
+static int convert_fn(struct db_record *rec, void *private_data)
 {
        struct winbindd_domain *domain;
        char *p;
-       DOM_SID sid;
+       NTSTATUS status;
+       struct dom_sid sid;
        uint32 rid;
        fstring keystr;
        fstring dom_name;
        TDB_DATA key2;
-       bool *failed = (bool *)state;
+       struct convert_fn_state *s = (struct convert_fn_state *)private_data;
 
-       DEBUG(10,("Converting %s\n", (const char *)key.dptr));
+       DEBUG(10,("Converting %s\n", (const char *)rec->key.dptr));
 
-       p = strchr((const char *)key.dptr, '/');
+       p = strchr((const char *)rec->key.dptr, '/');
        if (!p)
                return 0;
 
        *p = 0;
-       fstrcpy(dom_name, (const char *)key.dptr);
+       fstrcpy(dom_name, (const char *)rec->key.dptr);
        *p++ = '/';
 
        domain = find_domain_from_name(dom_name);
        if (domain == NULL) {
                /* We must delete the old record. */
                DEBUG(0,("Unable to find domain %s\n", dom_name ));
-               DEBUG(0,("deleting record %s\n", (const char *)key.dptr ));
-
-               if (tdb_delete(tdb, key) != 0) {
-                       DEBUG(0, ("Unable to delete record %s\n", (const char *)key.dptr));
-                       *failed = True;
+               DEBUG(0,("deleting record %s\n", (const char *)rec->key.dptr ));
+
+               status = rec->delete_rec(rec);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("Unable to delete record %s:%s\n",
+                               (const char *)rec->key.dptr,
+                               nt_errstr(status)));
+                       s->failed = true;
                        return -1;
                }
 
@@ -83,27 +96,35 @@ static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state
 
        rid = atoi(p);
 
-       sid_copy(&sid, &domain->sid);
-       sid_append_rid(&sid, rid);
+       sid_compose(&sid, &domain->sid, rid);
 
        sid_to_fstring(keystr, &sid);
        key2 = string_term_tdb_data(keystr);
 
-       if (tdb_store(tdb, key2, data, TDB_INSERT) != 0) {
-               DEBUG(0,("Unable to add record %s\n", (const char *)key2.dptr ));
-               *failed = True;
+       status = dbwrap_store(s->db, key2, rec->value, TDB_INSERT);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Unable to add record %s:%s\n",
+                       (const char *)key2.dptr,
+                       nt_errstr(status)));
+               s->failed = true;
                return -1;
        }
 
-       if (tdb_store(tdb, data, key2, TDB_REPLACE) != 0) {
-               DEBUG(0,("Unable to update record %s\n", (const char *)data.dptr ));
-               *failed = True;
+       status = dbwrap_store(s->db, rec->value, key2, TDB_REPLACE);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Unable to update record %s:%s\n",
+                       (const char *)rec->value.dptr,
+                       nt_errstr(status)));
+               s->failed = true;
                return -1;
        }
 
-       if (tdb_delete(tdb, key) != 0) {
-               DEBUG(0,("Unable to delete record %s\n", (const char *)key.dptr ));
-               *failed = True;
+       status = rec->delete_rec(rec);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Unable to delete record %s:%s\n",
+                       (const char *)rec->key.dptr,
+                       nt_errstr(status)));
+               s->failed = true;
                return -1;
        }
 
@@ -114,25 +135,17 @@ static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state
  Convert the idmap database from an older version.
 *****************************************************************************/
 
-static bool idmap_tdb_upgrade(const char *idmap_name)
+static bool idmap_tdb_upgrade(struct idmap_domain *dom, struct db_context *db)
 {
        int32 vers;
        bool bigendianheader;
-       bool failed = False;
-       TDB_CONTEXT *idmap_tdb;
+       struct convert_fn_state s;
 
        DEBUG(0, ("Upgrading winbindd_idmap.tdb from an old version\n"));
 
-       if (!(idmap_tdb = tdb_open_log(idmap_name, 0,
-                                       TDB_DEFAULT, O_RDWR,
-                                       0600))) {
-               DEBUG(0, ("Unable to open idmap database\n"));
-               return False;
-       }
-
-       bigendianheader = (tdb_get_flags(idmap_tdb) & TDB_BIGENDIAN) ? True : False;
+       bigendianheader = (db->get_flags(db) & TDB_BIGENDIAN) ? True : False;
 
-       vers = tdb_fetch_int32(idmap_tdb, "IDMAP_VERSION");
+       vers = dbwrap_fetch_int32(db, "IDMAP_VERSION");
 
        if (((vers == -1) && bigendianheader) || (IREV(vers) == IDMAP_VERSION)) {
                /* Arrggghh ! Bytereversed or old big-endian - make order independent ! */
@@ -143,256 +156,259 @@ static bool idmap_tdb_upgrade(const char *idmap_name)
 
                int32 wm;
 
-               wm = tdb_fetch_int32(idmap_tdb, HWM_USER);
+               wm = dbwrap_fetch_int32(db, HWM_USER);
 
                if (wm != -1) {
                        wm = IREV(wm);
                }  else {
-                       wm = idmap_tdb_state.low_uid;
+                       wm = dom->low_id;
                }
 
-               if (tdb_store_int32(idmap_tdb, HWM_USER, wm) == -1) {
+               if (dbwrap_store_int32(db, HWM_USER, wm) == -1) {
                        DEBUG(0, ("Unable to byteswap user hwm in idmap database\n"));
-                       tdb_close(idmap_tdb);
                        return False;
                }
 
-               wm = tdb_fetch_int32(idmap_tdb, HWM_GROUP);
+               wm = dbwrap_fetch_int32(db, HWM_GROUP);
                if (wm != -1) {
                        wm = IREV(wm);
                } else {
-                       wm = idmap_tdb_state.low_gid;
+                       wm = dom->low_id;
                }
 
-               if (tdb_store_int32(idmap_tdb, HWM_GROUP, wm) == -1) {
+               if (dbwrap_store_int32(db, HWM_GROUP, wm) == -1) {
                        DEBUG(0, ("Unable to byteswap group hwm in idmap database\n"));
-                       tdb_close(idmap_tdb);
                        return False;
                }
        }
 
+       s.db = db;
+       s.failed = false;
+
        /* the old format stored as DOMAIN/rid - now we store the SID direct */
-       tdb_traverse(idmap_tdb, convert_fn, &failed);
+       db->traverse(db, convert_fn, &s);
 
-       if (failed) {
+       if (s.failed) {
                DEBUG(0, ("Problem during conversion\n"));
-               tdb_close(idmap_tdb);
                return False;
        }
 
-       if (tdb_store_int32(idmap_tdb, "IDMAP_VERSION", IDMAP_VERSION) == -1) {
-               DEBUG(0, ("Unable to dtore idmap version in databse\n"));
-               tdb_close(idmap_tdb);
+       if (dbwrap_store_int32(db, "IDMAP_VERSION", IDMAP_VERSION) == -1) {
+               DEBUG(0, ("Unable to store idmap version in databse\n"));
                return False;
        }
 
-       tdb_close(idmap_tdb);
        return True;
 }
 
-/* WARNING: We can't open a tdb twice inthe same process, for that reason
- * I'm going to use a hack with open ref counts to open the winbindd_idmap.tdb
- * only once. We will later decide whether to split the db in multiple files
- * or come up with a better solution to share them. */
+static NTSTATUS idmap_tdb_init_hwm(struct idmap_domain *dom)
+{
+       int ret;
+       uint32_t low_uid;
+       uint32_t low_gid;
+       bool update_uid = false;
+       bool update_gid = false;
+       struct idmap_tdb_context *ctx;
+
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
+
+       low_uid = dbwrap_fetch_int32(ctx->db, HWM_USER);
+       if (low_uid == -1 || low_uid < dom->low_id) {
+               update_uid = true;
+       }
+
+       low_gid = dbwrap_fetch_int32(ctx->db, HWM_GROUP);
+       if (low_gid == -1 || low_gid < dom->low_id) {
+               update_gid = true;
+       }
+
+       if (!update_uid && !update_gid) {
+               return NT_STATUS_OK;
+       }
 
-static TDB_CONTEXT *idmap_tdb_common_ctx;
-static int idmap_tdb_open_ref_count = 0;
+       if (ctx->db->transaction_start(ctx->db) != 0) {
+               DEBUG(0, ("Unable to start upgrade transaction!\n"));
+               return NT_STATUS_INTERNAL_DB_ERROR;
+       }
 
-static NTSTATUS idmap_tdb_open_db(TALLOC_CTX *memctx, TDB_CONTEXT **tdbctx)
+       if (update_uid) {
+               ret = dbwrap_store_int32(ctx->db, HWM_USER, dom->low_id);
+               if (ret == -1) {
+                       ctx->db->transaction_cancel(ctx->db);
+                       DEBUG(0, ("Unable to initialise user hwm in idmap "
+                                 "database\n"));
+                       return NT_STATUS_INTERNAL_DB_ERROR;
+               }
+       }
+
+       if (update_gid) {
+               ret = dbwrap_store_int32(ctx->db, HWM_GROUP, dom->low_id);
+               if (ret == -1) {
+                       ctx->db->transaction_cancel(ctx->db);
+                       DEBUG(0, ("Unable to initialise group hwm in idmap "
+                                 "database\n"));
+                       return NT_STATUS_INTERNAL_DB_ERROR;
+               }
+       }
+
+       if (ctx->db->transaction_commit(ctx->db) != 0) {
+               DEBUG(0, ("Unable to commit upgrade transaction!\n"));
+               return NT_STATUS_INTERNAL_DB_ERROR;
+       }
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS idmap_tdb_open_db(struct idmap_domain *dom)
 {
        NTSTATUS ret;
-       TALLOC_CTX *ctx;
-       SMB_STRUCT_STAT stbuf;
+       TALLOC_CTX *mem_ctx;
        char *tdbfile = NULL;
-       int32 version;
-       bool tdb_is_new = False;
+       struct db_context *db = NULL;
+       int32_t version;
+       bool config_error = false;
+       struct idmap_tdb_context *ctx;
+
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
-       if (idmap_tdb_open_ref_count) { /* the tdb has already been opened */
-               idmap_tdb_open_ref_count++;
-               *tdbctx = idmap_tdb_common_ctx;
+       if (ctx->db) {
+               /* it is already open */
                return NT_STATUS_OK;
        }
 
        /* use our own context here */
-       ctx = talloc_new(memctx);
-       if (!ctx) {
-               DEBUG(0, ("Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
+       mem_ctx = talloc_stackframe();
 
        /* use the old database if present */
-       tdbfile = talloc_strdup(ctx, state_path("winbindd_idmap.tdb"));
+       tdbfile = state_path("winbindd_idmap.tdb");
        if (!tdbfile) {
                DEBUG(0, ("Out of memory!\n"));
                ret = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       if (!file_exist(tdbfile, &stbuf)) {
-               tdb_is_new = True;
-       }
-
        DEBUG(10,("Opening tdbfile %s\n", tdbfile ));
 
        /* Open idmap repository */
-       if (!(idmap_tdb_common_ctx = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR | O_CREAT, 0644))) {
+       db = db_open(mem_ctx, tdbfile, 0, TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
+       if (!db) {
                DEBUG(0, ("Unable to open idmap database\n"));
                ret = NT_STATUS_UNSUCCESSFUL;
                goto done;
        }
 
-       if (tdb_is_new) {
-               /* the file didn't existed before opening it, let's
-                * store idmap version as nobody else yet opened and
-                * stored it. I do not like this method but didn't
-                * found a way to understand if an opened tdb have
-                * been just created or not --- SSS */
-               tdb_store_int32(idmap_tdb_common_ctx, "IDMAP_VERSION", IDMAP_VERSION);
-       }
-
        /* check against earlier versions */
-       version = tdb_fetch_int32(idmap_tdb_common_ctx, "IDMAP_VERSION");
+       version = dbwrap_fetch_int32(db, "IDMAP_VERSION");
        if (version != IDMAP_VERSION) {
-               
-               /* backup_tdb expects the tdb not to be open */
-               tdb_close(idmap_tdb_common_ctx);
+               if (config_error) {
+                       DEBUG(0,("Upgrade of IDMAP_VERSION from %d to %d is not "
+                                "possible with incomplete configuration\n",
+                                version, IDMAP_VERSION));
+                       ret = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
+               }
+               if (db->transaction_start(db) != 0) {
+                       DEBUG(0, ("Unable to start upgrade transaction!\n"));
+                       ret = NT_STATUS_INTERNAL_DB_ERROR;
+                       goto done;
+               }
 
-               if ( ! idmap_tdb_upgrade(tdbfile)) {
-               
-                       DEBUG(0, ("Unable to open idmap database, it's in an old formati, and upgrade failed!\n"));
+               if (!idmap_tdb_upgrade(dom, db)) {
+                       db->transaction_cancel(db);
+                       DEBUG(0, ("Unable to open idmap database, it's in an old format, and upgrade failed!\n"));
                        ret = NT_STATUS_INTERNAL_DB_ERROR;
                        goto done;
                }
 
-               /* Re-Open idmap repository */
-               if (!(idmap_tdb_common_ctx = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR | O_CREAT, 0644))) {
-                       DEBUG(0, ("Unable to open idmap database\n"));
-                       ret = NT_STATUS_UNSUCCESSFUL;
+               if (db->transaction_commit(db) != 0) {
+                       DEBUG(0, ("Unable to commit upgrade transaction!\n"));
+                       ret = NT_STATUS_INTERNAL_DB_ERROR;
                        goto done;
                }
        }
 
-       *tdbctx = idmap_tdb_common_ctx;
-       idmap_tdb_open_ref_count++;
-       ret = NT_STATUS_OK;
+       ctx->db = talloc_move(ctx, &db);
+
+       ret = idmap_tdb_init_hwm(dom);
 
 done:
-       talloc_free(ctx);
+       talloc_free(mem_ctx);
        return ret;
 }
 
- /* NEVER use tdb_close() except for the conversion routines that are guaranteed
- * to run only when the database is opened the first time, always use this function. */ 
-
-bool idmap_tdb_tdb_close(TDB_CONTEXT *tdbctx)
-{
-       if (tdbctx != idmap_tdb_common_ctx) {
-               DEBUG(0, ("ERROR: Invalid tdb context!"));
-               return False;
-       }
-
-       idmap_tdb_open_ref_count--;
-       if (idmap_tdb_open_ref_count) {
-               return True;
-       }
-
-       return tdb_close(idmap_tdb_common_ctx);
-}
-
 /**********************************************************************
  IDMAP ALLOC TDB BACKEND
 **********************************************************************/
  
-static TDB_CONTEXT *idmap_alloc_tdb;
-
 /**********************************
Initialise idmap alloc database
Allocate a new id
 **********************************/
 
-static NTSTATUS idmap_tdb_alloc_init( const char *params )
+struct idmap_tdb_allocate_id_context {
+       const char *hwmkey;
+       const char *hwmtype;
+       uint32_t high_hwm;
+       uint32_t hwm;
+};
+
+static NTSTATUS idmap_tdb_allocate_id_action(struct db_context *db,
+                                            void *private_data)
 {
        NTSTATUS ret;
-       TALLOC_CTX *ctx;
-       uid_t low_uid = 0;
-       uid_t high_uid = 0;
-       gid_t low_gid = 0;
-       gid_t high_gid = 0;
-       uint32_t low_id;
-
-       /* use our own context here */
-       ctx = talloc_new(NULL);
-       if (!ctx) {
-               DEBUG(0, ("Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       ret = idmap_tdb_open_db(ctx, &idmap_alloc_tdb);
-       if ( ! NT_STATUS_IS_OK(ret)) {
-               talloc_free(ctx);
-               return ret;
-       }
-
-       talloc_free(ctx);
+       struct idmap_tdb_allocate_id_context *state;
+       uint32_t hwm;
 
-       /* load ranges */
+       state = (struct idmap_tdb_allocate_id_context *)private_data;
 
-       if (!lp_idmap_uid(&low_uid, &high_uid)
-           || !lp_idmap_gid(&low_gid, &high_gid)) {
-               DEBUG(1, ("idmap uid or idmap gid missing\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+       hwm = dbwrap_fetch_int32(db, state->hwmkey);
+       if (hwm == -1) {
+               ret = NT_STATUS_INTERNAL_DB_ERROR;
+               goto done;
        }
 
-       idmap_tdb_state.low_uid = low_uid;
-       idmap_tdb_state.high_uid = high_uid;
-       idmap_tdb_state.low_gid = low_gid;
-       idmap_tdb_state.high_gid = high_gid;
-
-       if (idmap_tdb_state.high_uid <= idmap_tdb_state.low_uid) {
-               DEBUG(1, ("idmap uid range missing or invalid\n"));
-               DEBUGADD(1, ("idmap will be unable to map foreign SIDs\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+       /* check it is in the range */
+       if (hwm > state->high_hwm) {
+               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n",
+                         state->hwmtype, (unsigned long)state->high_hwm));
+               ret = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
-       if (idmap_tdb_state.high_gid <= idmap_tdb_state.low_gid) {
-               DEBUG(1, ("idmap gid range missing or invalid\n"));
-               DEBUGADD(1, ("idmap will be unable to map foreign SIDs\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+       /* fetch a new id and increment it */
+       ret = dbwrap_trans_change_uint32_atomic(db, state->hwmkey, &hwm, 1);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0, ("Fatal error while fetching a new %s value: %s\n!",
+                         state->hwmtype, nt_errstr(ret)));
+               goto done;
        }
 
-       if (((low_id = tdb_fetch_int32(idmap_alloc_tdb, HWM_USER)) == -1) ||
-           (low_id < idmap_tdb_state.low_uid)) {
-               if (tdb_store_int32(idmap_alloc_tdb, HWM_USER,
-                                   idmap_tdb_state.low_uid) == -1) {
-                       DEBUG(0, ("Unable to initialise user hwm in idmap "
-                                 "database\n"));
-                       return NT_STATUS_INTERNAL_DB_ERROR;
-               }
+       /* recheck it is in the range */
+       if (hwm > state->high_hwm) {
+               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n",
+                         state->hwmtype, (unsigned long)state->high_hwm));
+               ret = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
-       if (((low_id = tdb_fetch_int32(idmap_alloc_tdb, HWM_GROUP)) == -1) ||
-           (low_id < idmap_tdb_state.low_gid)) {
-               if (tdb_store_int32(idmap_alloc_tdb, HWM_GROUP,
-                                   idmap_tdb_state.low_gid) == -1) {
-                       DEBUG(0, ("Unable to initialise group hwm in idmap "
-                                 "database\n"));
-                       return NT_STATUS_INTERNAL_DB_ERROR;
-               }
-       }
+       ret = NT_STATUS_OK;
+       state->hwm = hwm;
 
-       return NT_STATUS_OK;
+done:
+       return ret;
 }
 
-/**********************************
- Allocate a new id. 
-**********************************/
-
-static NTSTATUS idmap_tdb_allocate_id(struct unixid *xid)
+static NTSTATUS idmap_tdb_allocate_id(struct idmap_domain *dom,
+                                     struct unixid *xid)
 {
-       bool ret;
        const char *hwmkey;
        const char *hwmtype;
        uint32_t high_hwm;
-       uint32_t hwm;
+       uint32_t hwm = 0;
+       NTSTATUS status;
+       struct idmap_tdb_allocate_id_context state;
+       struct idmap_tdb_context *ctx;
+
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
        /* Get current high water mark */
        switch (xid->type) {
@@ -400,13 +416,11 @@ static NTSTATUS idmap_tdb_allocate_id(struct unixid *xid)
        case ID_TYPE_UID:
                hwmkey = HWM_USER;
                hwmtype = "UID";
-               high_hwm = idmap_tdb_state.high_uid;
                break;
 
        case ID_TYPE_GID:
                hwmkey = HWM_GROUP;
                hwmtype = "GID";
-               high_hwm = idmap_tdb_state.high_gid;
                break;
 
        default:
@@ -414,219 +428,251 @@ static NTSTATUS idmap_tdb_allocate_id(struct unixid *xid)
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if ((hwm = tdb_fetch_int32(idmap_alloc_tdb, hwmkey)) == -1) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
+       high_hwm = dom->high_id;
 
-       /* check it is in the range */
-       if (hwm > high_hwm) {
-               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n", 
-                         hwmtype, (unsigned long)high_hwm));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       state.hwm = hwm;
+       state.high_hwm = high_hwm;
+       state.hwmtype = hwmtype;
+       state.hwmkey = hwmkey;
 
-       /* fetch a new id and increment it */
-       ret = tdb_change_uint32_atomic(idmap_alloc_tdb, hwmkey, &hwm, 1);
-       if (!ret) {
-               DEBUG(1, ("Fatal error while fetching a new %s value\n!", hwmtype));
-               return NT_STATUS_UNSUCCESSFUL;
+       status = dbwrap_trans_do(ctx->db, idmap_tdb_allocate_id_action,
+                                &state);
+
+       if (NT_STATUS_IS_OK(status)) {
+               xid->id = state.hwm;
+               DEBUG(10,("New %s = %d\n", hwmtype, state.hwm));
+       } else {
+               DEBUG(1, ("Error allocating a new %s\n", hwmtype));
        }
 
-       /* recheck it is in the range */
-       if (hwm > high_hwm) {
-               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n", 
-                         hwmtype, (unsigned long)high_hwm));
-               return NT_STATUS_UNSUCCESSFUL;
+       return status;
+}
+
+/**
+ * Allocate a new unix-ID.
+ * For now this is for the default idmap domain only.
+ * Should be extended later on.
+ */
+static NTSTATUS idmap_tdb_get_new_id(struct idmap_domain *dom,
+                                    struct unixid *id)
+{
+       NTSTATUS ret;
+
+       if (!strequal(dom->name, "*")) {
+               DEBUG(3, ("idmap_tdb_get_new_id: "
+                         "Refusing allocation of a new unixid for domain'%s'. "
+                         "Currently only supported for the default "
+                         "domain \"*\".\n",
+                          dom->name));
+               return NT_STATUS_NOT_IMPLEMENTED;
        }
-       
-       xid->id = hwm;
-       DEBUG(10,("New %s = %d\n", hwmtype, hwm));
 
-       return NT_STATUS_OK;
+       ret = idmap_tdb_allocate_id(dom, id);
+
+       return ret;
 }
 
-/**********************************
- Get current highest id. 
-**********************************/
+/**********************************************************************
+ IDMAP MAPPING TDB BACKEND
+**********************************************************************/
 
-static NTSTATUS idmap_tdb_get_hwm(struct unixid *xid)
-{
-       const char *hwmkey;
-       const char *hwmtype;
-       uint32_t hwm;
-       uint32_t high_hwm;
+/*****************************
+ Initialise idmap database. 
+*****************************/
 
-       /* Get current high water mark */
-       switch (xid->type) {
+static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom,
+                                     const struct id_map *map);
 
-       case ID_TYPE_UID:
-               hwmkey = HWM_USER;
-               hwmtype = "UID";
-               high_hwm = idmap_tdb_state.high_uid;
-               break;
+static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom, const char *params)
+{
+       NTSTATUS ret;
+       struct idmap_tdb_context *ctx;
 
-       case ID_TYPE_GID:
-               hwmkey = HWM_GROUP;
-               hwmtype = "GID";
-               high_hwm = idmap_tdb_state.high_gid;
-               break;
+       DEBUG(10, ("idmap_tdb_db_init called for domain '%s'\n", dom->name));
 
-       default:
-               return NT_STATUS_INVALID_PARAMETER;
+       ctx = talloc_zero(dom, struct idmap_tdb_context);
+       if ( ! ctx) {
+               DEBUG(0, ("Out of memory!\n"));
+               return NT_STATUS_NO_MEMORY;
        }
 
-       if ((hwm = tdb_fetch_int32(idmap_alloc_tdb, hwmkey)) == -1) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
+       /* load backend specific configuration here: */
+#if 0
+       if (strequal(dom->name, "*")) {
+       } else {
+       }
+#endif
+
+       ctx->rw_ops = talloc_zero(ctx, struct idmap_rw_ops);
+       if (ctx->rw_ops == NULL) {
+               DEBUG(0, ("Out of memory!\n"));
+               ret = NT_STATUS_NO_MEMORY;
+               goto failed;
        }
 
-       xid->id = hwm;
+       ctx->rw_ops->get_new_id = idmap_tdb_get_new_id;
+       ctx->rw_ops->set_mapping = idmap_tdb_set_mapping;
 
-       /* Warn if it is out of range */
-       if (hwm >= high_hwm) {
-               DEBUG(0, ("Warning: %s range full!! (max: %lu)\n", 
-                         hwmtype, (unsigned long)high_hwm));
+       dom->private_data = ctx;
+
+       ret = idmap_tdb_open_db(dom);
+       if ( ! NT_STATUS_IS_OK(ret)) {
+               goto failed;
        }
 
        return NT_STATUS_OK;
-}
 
-/**********************************
- Set high id. 
-**********************************/
+failed:
+       talloc_free(ctx);
+       return ret;
+}
 
-static NTSTATUS idmap_tdb_set_hwm(struct unixid *xid)
-{
-       const char *hwmkey;
-       const char *hwmtype;
-       uint32_t hwm;
-       uint32_t high_hwm;
 
-       /* Get current high water mark */
-       switch (xid->type) {
+/**
+ * store a mapping in the database
+ */
 
-       case ID_TYPE_UID:
-               hwmkey = HWM_USER;
-               hwmtype = "UID";
-               high_hwm = idmap_tdb_state.high_uid;
-               break;
+struct idmap_tdb_set_mapping_context {
+       const char *ksidstr;
+       const char *kidstr;
+};
 
-       case ID_TYPE_GID:
-               hwmkey = HWM_GROUP;
-               hwmtype = "GID";
-               high_hwm = idmap_tdb_state.high_gid;
-               break;
+static NTSTATUS idmap_tdb_set_mapping_action(struct db_context *db,
+                                            void *private_data)
+{
+       NTSTATUS ret;
+       struct idmap_tdb_set_mapping_context *state;
 
-       default:
-               return NT_STATUS_INVALID_PARAMETER;
-       }
+       state = (struct idmap_tdb_set_mapping_context *)private_data;
 
-       hwm = xid->id;
+       DEBUG(10, ("Storing %s <-> %s map\n", state->ksidstr, state->kidstr));
 
-       if ((hwm = tdb_store_int32(idmap_alloc_tdb, hwmkey, hwm)) == -1) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
+       ret = dbwrap_store_bystring(db, state->ksidstr,
+                                   string_term_tdb_data(state->kidstr),
+                                   TDB_REPLACE);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0, ("Error storing SID -> ID (%s -> %s): %s\n",
+                         state->ksidstr, state->kidstr, nt_errstr(ret)));
+               goto done;
        }
 
-       /* Warn if it is out of range */
-       if (hwm >= high_hwm) {
-               DEBUG(0, ("Warning: %s range full!! (max: %lu)\n", 
-                         hwmtype, (unsigned long)high_hwm));
+       ret = dbwrap_store_bystring(db, state->kidstr,
+                                   string_term_tdb_data(state->ksidstr),
+                                   TDB_REPLACE);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0, ("Error storing ID -> SID (%s -> %s): %s\n",
+                         state->kidstr, state->ksidstr, nt_errstr(ret)));
+               goto done;
        }
 
-       return NT_STATUS_OK;
-}
+       DEBUG(10,("Stored %s <-> %s\n", state->ksidstr, state->kidstr));
+       ret = NT_STATUS_OK;
 
-/**********************************
- Close the alloc tdb 
-**********************************/
+done:
+       return ret;
+}
 
-static NTSTATUS idmap_tdb_alloc_close(void)
+static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom,
+                                     const struct id_map *map)
 {
-       if (idmap_alloc_tdb) {
-               if (idmap_tdb_tdb_close(idmap_alloc_tdb) == 0) {
-                       return NT_STATUS_OK;
-               } else {
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
+       struct idmap_tdb_context *ctx;
+       NTSTATUS ret;
+       char *ksidstr, *kidstr;
+       struct idmap_tdb_set_mapping_context state;
+
+       if (!map || !map->sid) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
-       return NT_STATUS_OK;
-}
 
-/**********************************************************************
- IDMAP MAPPING TDB BACKEND
-**********************************************************************/
-struct idmap_tdb_context {
-       TDB_CONTEXT *tdb;
-       uint32_t filter_low_id;
-       uint32_t filter_high_id;
-};
+       ksidstr = kidstr = NULL;
 
-/*****************************
- Initialise idmap database. 
-*****************************/
+       /* TODO: should we filter a set_mapping using low/high filters ? */
 
-static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom, const char *params)
-{
-       NTSTATUS ret;
-       struct idmap_tdb_context *ctx;
-       char *config_option = NULL;
-       const char *range;
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
-       ctx = talloc(dom, struct idmap_tdb_context);
-       if ( ! ctx) {
-               DEBUG(0, ("Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
+       switch (map->xid.type) {
+
+       case ID_TYPE_UID:
+               kidstr = talloc_asprintf(ctx, "UID %lu",
+                                        (unsigned long)map->xid.id);
+               break;
+
+       case ID_TYPE_GID:
+               kidstr = talloc_asprintf(ctx, "GID %lu",
+                                        (unsigned long)map->xid.id);
+               break;
+
+       default:
+               DEBUG(2, ("INVALID unix ID type: 0x02%x\n", map->xid.type));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
-       if ( ! config_option) {
-               DEBUG(0, ("Out of memory!\n"));
+       if (kidstr == NULL) {
+               DEBUG(0, ("ERROR: Out of memory!\n"));
                ret = NT_STATUS_NO_MEMORY;
-               goto failed;
+               goto done;
        }
 
-       ret = idmap_tdb_open_db(ctx, &ctx->tdb);
-       if ( ! NT_STATUS_IS_OK(ret)) {
-               goto failed;
+       ksidstr = sid_string_talloc(ctx, map->sid);
+       if (ksidstr == NULL) {
+               DEBUG(0, ("Out of memory!\n"));
+               ret = NT_STATUS_NO_MEMORY;
+               goto done;
        }
 
-       range = lp_parm_const_string(-1, config_option, "range", NULL);
-       if (( ! range) ||
-           (sscanf(range, "%u - %u", &ctx->filter_low_id, &ctx->filter_high_id) != 2) ||
-           (ctx->filter_low_id > ctx->filter_high_id)) {
-               ctx->filter_low_id = 0;
-               ctx->filter_high_id = 0;
-       }
+       state.ksidstr = ksidstr;
+       state.kidstr = kidstr;
 
-       dom->private_data = ctx;
+       ret = dbwrap_trans_do(ctx->db, idmap_tdb_set_mapping_action, &state);
 
-       talloc_free(config_option);
-       return NT_STATUS_OK;
+done:
+       talloc_free(ksidstr);
+       talloc_free(kidstr);
+       return ret;
+}
+
+/**
+ * Create a new mapping for an unmapped SID, also allocating a new ID.
+ * This should be run inside a transaction.
+ *
+ * TODO:
+ * Properly integrate this with multi domain idmap config:
+ * Currently, the allocator is default-config only.
+ */
+static NTSTATUS idmap_tdb_new_mapping(struct idmap_domain *dom, struct id_map *map)
+{
+       NTSTATUS ret;
+       struct idmap_tdb_context *ctx;
+
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
+
+       ret = idmap_rw_new_mapping(dom, ctx->rw_ops, map);
 
-failed:
-       talloc_free(ctx);
        return ret;
 }
 
+
 /**********************************
  Single id to sid lookup function. 
 **********************************/
 
-static NTSTATUS idmap_tdb_id_to_sid(struct idmap_tdb_context *ctx, struct id_map *map)
+static NTSTATUS idmap_tdb_id_to_sid(struct idmap_domain *dom, struct id_map *map)
 {
        NTSTATUS ret;
        TDB_DATA data;
        char *keystr;
+       struct idmap_tdb_context *ctx;
 
-       if (!ctx || !map) {
+       if (!dom || !map) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
+
        /* apply filters before checking */
-       if ((ctx->filter_low_id && (map->xid.id < ctx->filter_low_id)) ||
-           (ctx->filter_high_id && (map->xid.id > ctx->filter_high_id))) {
+       if (!idmap_unix_id_is_in_range(map->xid.id, dom)) {
                DEBUG(5, ("Requested id (%u) out of range (%u - %u). Filtered!\n",
-                               map->xid.id, ctx->filter_low_id, ctx->filter_high_id));
+                               map->xid.id, dom->low_id, dom->high_id));
                return NT_STATUS_NONE_MAPPED;
        }
 
@@ -657,7 +703,7 @@ static NTSTATUS idmap_tdb_id_to_sid(struct idmap_tdb_context *ctx, struct id_map
        DEBUG(10,("Fetching record %s\n", keystr));
 
        /* Check if the mapping exists */
-       data = tdb_fetch_bystring(ctx->tdb, keystr);
+       data = dbwrap_fetch_bystring(ctx->db, NULL, keystr);
 
        if (!data.dptr) {
                DEBUG(10,("Record %s not found\n", keystr));
@@ -676,7 +722,7 @@ static NTSTATUS idmap_tdb_id_to_sid(struct idmap_tdb_context *ctx, struct id_map
        ret = NT_STATUS_OK;
 
 done:
-       SAFE_FREE(data.dptr);
+       talloc_free(data.dptr);
        talloc_free(keystr);
        return ret;
 }
@@ -685,16 +731,19 @@ done:
  Single sid to id lookup function. 
 **********************************/
 
-static NTSTATUS idmap_tdb_sid_to_id(struct idmap_tdb_context *ctx, struct id_map *map)
+static NTSTATUS idmap_tdb_sid_to_id(struct idmap_domain *dom, struct id_map *map)
 {
        NTSTATUS ret;
        TDB_DATA data;
        char *keystr;
        unsigned long rec_id = 0;
-       fstring tmp;
+       struct idmap_tdb_context *ctx;
+       TALLOC_CTX *tmp_ctx = talloc_stackframe();
+
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
-       if ((keystr = talloc_asprintf(
-                    ctx, "%s", sid_to_fstring(tmp, map->sid))) == NULL) {
+       keystr = sid_string_talloc(tmp_ctx, map->sid);
+       if (keystr == NULL) {
                DEBUG(0, ("Out of memory!\n"));
                ret = NT_STATUS_NO_MEMORY;
                goto done;
@@ -703,7 +752,7 @@ static NTSTATUS idmap_tdb_sid_to_id(struct idmap_tdb_context *ctx, struct id_map
        DEBUG(10,("Fetching record %s\n", keystr));
 
        /* Check if sid is present in database */
-       data = tdb_fetch_bystring(ctx->tdb, keystr);
+       data = dbwrap_fetch_bystring(ctx->db, tmp_ctx, keystr);
        if (!data.dptr) {
                DEBUG(10,("Record %s not found\n", keystr));
                ret = NT_STATUS_NONE_MAPPED;
@@ -726,20 +775,18 @@ static NTSTATUS idmap_tdb_sid_to_id(struct idmap_tdb_context *ctx, struct id_map
        } else { /* Unknown record type ! */
                DEBUG(2, ("Found INVALID record %s -> %s\n", keystr, (const char *)data.dptr));
                ret = NT_STATUS_INTERNAL_DB_ERROR;
+               goto done;
        }
-       
-       SAFE_FREE(data.dptr);
 
        /* apply filters before returning result */
-       if ((ctx->filter_low_id && (map->xid.id < ctx->filter_low_id)) ||
-           (ctx->filter_high_id && (map->xid.id > ctx->filter_high_id))) {
+       if (!idmap_unix_id_is_in_range(map->xid.id, dom)) {
                DEBUG(5, ("Requested id (%u) out of range (%u - %u). Filtered!\n",
-                               map->xid.id, ctx->filter_low_id, ctx->filter_high_id));
+                               map->xid.id, dom->low_id, dom->high_id));
                ret = NT_STATUS_NONE_MAPPED;
        }
 
 done:
-       talloc_free(keystr);
+       talloc_free(tmp_ctx);
        return ret;
 }
 
@@ -753,10 +800,15 @@ static NTSTATUS idmap_tdb_unixids_to_sids(struct idmap_domain *dom, struct id_ma
        NTSTATUS ret;
        int i;
 
+       /* initialize the status to avoid suprise */
+       for (i = 0; ids[i]; i++) {
+               ids[i]->status = ID_UNKNOWN;
+       }
+       
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
        for (i = 0; ids[i]; i++) {
-               ret = idmap_tdb_id_to_sid(ctx, ids[i]);
+               ret = idmap_tdb_id_to_sid(dom, ids[i]);
                if ( ! NT_STATUS_IS_OK(ret)) {
 
                        /* if it is just a failed mapping continue */
@@ -785,247 +837,97 @@ done:
  lookup a set of sids. 
 **********************************/
 
-static NTSTATUS idmap_tdb_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
+struct idmap_tdb_sids_to_unixids_context {
+       struct idmap_domain *dom;
+       struct id_map **ids;
+       bool allocate_unmapped;
+};
+
+static NTSTATUS idmap_tdb_sids_to_unixids_action(struct db_context *db,
+                                                void *private_data)
 {
-       struct idmap_tdb_context *ctx;
-       NTSTATUS ret;
+       struct idmap_tdb_sids_to_unixids_context *state;
        int i;
+       NTSTATUS ret;
 
-       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
-
-       for (i = 0; ids[i]; i++) {
-               ret = idmap_tdb_sid_to_id(ctx, ids[i]);
-               if ( ! NT_STATUS_IS_OK(ret)) {
-
-                       /* if it is just a failed mapping continue */
-                       if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
-
-                               /* make sure it is marked as unmapped */
-                               ids[i]->status = ID_UNMAPPED;
-                               continue;
+       state = (struct idmap_tdb_sids_to_unixids_context *)private_data;
+
+       DEBUG(10, ("idmap_tdb_sids_to_unixids_action: "
+                  " domain: [%s], allocate: %s\n",
+                  state->dom->name,
+                  state->allocate_unmapped ? "yes" : "no"));
+
+       for (i = 0; state->ids[i]; i++) {
+               if ((state->ids[i]->status == ID_UNKNOWN) ||
+                   /* retry if we could not map in previous run: */
+                   (state->ids[i]->status == ID_UNMAPPED))
+               {
+                       NTSTATUS ret2;
+
+                       ret2 = idmap_tdb_sid_to_id(state->dom, state->ids[i]);
+                       if (!NT_STATUS_IS_OK(ret2)) {
+
+                               /* if it is just a failed mapping, continue */
+                               if (NT_STATUS_EQUAL(ret2, NT_STATUS_NONE_MAPPED)) {
+
+                                       /* make sure it is marked as unmapped */
+                                       state->ids[i]->status = ID_UNMAPPED;
+                                       ret = STATUS_SOME_UNMAPPED;
+                               } else {
+                                       /* some fatal error occurred, return immediately */
+                                       ret = ret2;
+                                       goto done;
+                               }
+                       } else {
+                               /* all ok, id is mapped */
+                               state->ids[i]->status = ID_MAPPED;
                        }
-                       
-                       /* some fatal error occurred, return immediately */
-                       goto done;
                }
 
-               /* all ok, id is mapped */
-               ids[i]->status = ID_MAPPED;
+               if ((state->ids[i]->status == ID_UNMAPPED) &&
+                   state->allocate_unmapped)
+               {
+                       ret = idmap_tdb_new_mapping(state->dom, state->ids[i]);
+                       if (!NT_STATUS_IS_OK(ret)) {
+                               goto done;
+                       }
+               }
        }
 
-       ret = NT_STATUS_OK;
-
 done:
        return ret;
 }
 
-/**********************************
- set a mapping. 
-**********************************/
-
-static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_map *map)
+static NTSTATUS idmap_tdb_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
        struct idmap_tdb_context *ctx;
        NTSTATUS ret;
-       TDB_DATA ksid, kid, data;
-       char *ksidstr, *kidstr;
-       fstring tmp;
+       int i;
+       struct idmap_tdb_sids_to_unixids_context state;
 
-       if (!map || !map->sid) {
-               return NT_STATUS_INVALID_PARAMETER;
+       /* initialize the status to avoid suprise */
+       for (i = 0; ids[i]; i++) {
+               ids[i]->status = ID_UNKNOWN;
        }
-
-       ksidstr = kidstr = NULL;
-       data.dptr = NULL;
-
-       /* TODO: should we filter a set_mapping using low/high filters ? */
        
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
-       switch (map->xid.type) {
+       state.dom = dom;
+       state.ids = ids;
+       state.allocate_unmapped = false;
 
-       case ID_TYPE_UID:
-               kidstr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
-               break;
-               
-       case ID_TYPE_GID:
-               kidstr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
-               break;
-
-       default:
-               DEBUG(2, ("INVALID unix ID type: 0x02%x\n", map->xid.type));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (kidstr == NULL) {
-               DEBUG(0, ("ERROR: Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
+       ret = idmap_tdb_sids_to_unixids_action(ctx->db, &state);
 
-       if ((ksidstr = talloc_asprintf(
-                    ctx, "%s", sid_to_fstring(tmp, map->sid))) == NULL) {
-               DEBUG(0, ("Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       DEBUG(10, ("Storing %s <-> %s map\n", ksidstr, kidstr));
-       kid = string_term_tdb_data(kidstr);
-       ksid = string_term_tdb_data(ksidstr);
-
-       /* *DELETE* previous mappings if any.
-        * This is done both SID and [U|G]ID passed in */
-       
-       /* Lock the record for this SID. */
-       if (tdb_chainlock(ctx->tdb, ksid) != 0) {
-               DEBUG(10,("Failed to lock record %s. Error %s\n",
-                               ksidstr, tdb_errorstr(ctx->tdb) ));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       data = tdb_fetch(ctx->tdb, ksid);
-       if (data.dptr) {
-               DEBUG(10, ("Deleting existing mapping %s <-> %s\n", (const char *)data.dptr, ksidstr ));
-               tdb_delete(ctx->tdb, data);
-               tdb_delete(ctx->tdb, ksid);
-               SAFE_FREE(data.dptr);
-       }
-
-       data = tdb_fetch(ctx->tdb, kid);
-       if (data.dptr) {
-               DEBUG(10,("Deleting existing mapping %s <-> %s\n", (const char *)data.dptr, kidstr ));
-               tdb_delete(ctx->tdb, data);
-               tdb_delete(ctx->tdb, kid);
-               SAFE_FREE(data.dptr);
-       }
-
-       if (tdb_store(ctx->tdb, ksid, kid, TDB_INSERT) == -1) {
-               DEBUG(0, ("Error storing SID -> ID: %s\n", tdb_errorstr(ctx->tdb)));
-               tdb_chainunlock(ctx->tdb, ksid);
-               ret = NT_STATUS_UNSUCCESSFUL;
-               goto done;
+       if (NT_STATUS_EQUAL(ret, STATUS_SOME_UNMAPPED) && !dom->read_only) {
+               state.allocate_unmapped = true;
+               ret = dbwrap_trans_do(ctx->db,
+                                     idmap_tdb_sids_to_unixids_action,
+                                     &state);
        }
-       if (tdb_store(ctx->tdb, kid, ksid, TDB_INSERT) == -1) {
-               DEBUG(0, ("Error stroing ID -> SID: %s\n", tdb_errorstr(ctx->tdb)));
-               /* try to remove the previous stored SID -> ID map */
-               tdb_delete(ctx->tdb, ksid);
-               tdb_chainunlock(ctx->tdb, ksid);
-               ret = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       tdb_chainunlock(ctx->tdb, ksid);
-       DEBUG(10,("Stored %s <-> %s\n", ksidstr, kidstr));
-       ret = NT_STATUS_OK;
 
-done:
-       talloc_free(ksidstr);
-       talloc_free(kidstr);
-       SAFE_FREE(data.dptr);
        return ret;
 }
 
-/**********************************
- remove a mapping. 
-**********************************/
-
-static NTSTATUS idmap_tdb_remove_mapping(struct idmap_domain *dom, const struct id_map *map)
-{
-       struct idmap_tdb_context *ctx;
-       NTSTATUS ret;
-       TDB_DATA ksid, kid, data;
-       char *ksidstr, *kidstr;
-       fstring tmp;
-
-       if (!map || !map->sid) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       ksidstr = kidstr = NULL;
-       data.dptr = NULL;
-
-       /* TODO: should we filter a remove_mapping using low/high filters ? */
-       
-       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
-
-       switch (map->xid.type) {
-
-       case ID_TYPE_UID:
-               kidstr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
-               break;
-               
-       case ID_TYPE_GID:
-               kidstr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
-               break;
-
-       default:
-               DEBUG(2, ("INVALID unix ID type: 0x02%x\n", map->xid.type));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       if (kidstr == NULL) {
-               DEBUG(0, ("ERROR: Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       if ((ksidstr = talloc_asprintf(
-                    ctx, "%s", sid_to_fstring(tmp, map->sid))) == NULL) {
-               DEBUG(0, ("Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto done;
-       }
-
-       DEBUG(10, ("Checking %s <-> %s map\n", ksidstr, kidstr));
-       ksid = string_term_tdb_data(ksidstr);
-       kid = string_term_tdb_data(kidstr);
-
-       /* Lock the record for this SID. */
-       if (tdb_chainlock(ctx->tdb, ksid) != 0) {
-               DEBUG(10,("Failed to lock record %s. Error %s\n",
-                               ksidstr, tdb_errorstr(ctx->tdb) ));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       /* Check if sid is present in database */
-       data = tdb_fetch(ctx->tdb, ksid);
-       if (!data.dptr) {
-               DEBUG(10,("Record %s not found\n", ksidstr));
-               tdb_chainunlock(ctx->tdb, ksid);
-               ret = NT_STATUS_NONE_MAPPED;
-               goto done;
-       }
-
-       /* Check if sid is mapped to the specified ID */
-       if ((data.dsize != kid.dsize) ||
-           (memcmp(data.dptr, kid.dptr, data.dsize) != 0)) {
-               DEBUG(10,("Specified SID does not map to specified ID\n"));
-               DEBUGADD(10,("Actual mapping is %s -> %s\n", ksidstr, (const char *)data.dptr));
-               tdb_chainunlock(ctx->tdb, ksid);
-               ret = NT_STATUS_NONE_MAPPED;
-               goto done;
-       }
-       
-       DEBUG(10, ("Removing %s <-> %s map\n", ksidstr, kidstr));
-
-       /* Delete previous mappings. */
-       
-       DEBUG(10, ("Deleting existing mapping %s -> %s\n", ksidstr, kidstr ));
-       tdb_delete(ctx->tdb, ksid);
-
-       DEBUG(10,("Deleting existing mapping %s -> %s\n", kidstr, ksidstr ));
-       tdb_delete(ctx->tdb, kid);
-
-       tdb_chainunlock(ctx->tdb, ksid);
-       ret = NT_STATUS_OK;
-
-done:
-       talloc_free(ksidstr);
-       talloc_free(kidstr);
-       SAFE_FREE(data.dptr);
-       return ret;
-}
 
 /**********************************
  Close the idmap tdb instance
@@ -1038,142 +940,22 @@ static NTSTATUS idmap_tdb_close(struct idmap_domain *dom)
        if (dom->private_data) {
                ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
-               if (idmap_tdb_tdb_close(ctx->tdb) == 0) {
-                       return NT_STATUS_OK;
-               } else {
-                       return NT_STATUS_UNSUCCESSFUL;
-               }
+               TALLOC_FREE(ctx->db);
        }
        return NT_STATUS_OK;
 }
 
-struct dump_data {
-       TALLOC_CTX *memctx;
-       struct id_map **maps;
-       int *num_maps;
-       NTSTATUS ret;
-};
-
-static int idmap_tdb_dump_one_entry(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA value, void *pdata)
-{
-       struct dump_data *data = talloc_get_type(pdata, struct dump_data);
-       struct id_map *maps;
-       int num_maps = *data->num_maps;
-
-       /* ignore any record but the ones with a SID as key */
-       if (strncmp((const char *)key.dptr, "S-", 2) == 0) {
-
-               maps = talloc_realloc(NULL, *data->maps, struct id_map, num_maps+1);
-               if ( ! maps) {
-                       DEBUG(0, ("Out of memory!\n"));
-                       data->ret = NT_STATUS_NO_MEMORY;
-                       return -1;
-               }
-                       *data->maps = maps;
-               maps[num_maps].sid = talloc(maps, DOM_SID);
-               if ( ! maps[num_maps].sid) {
-                       DEBUG(0, ("Out of memory!\n"));
-                       data->ret = NT_STATUS_NO_MEMORY;
-                       return -1;
-               }
-
-               if (!string_to_sid(maps[num_maps].sid, (const char *)key.dptr)) {
-                       DEBUG(10,("INVALID record %s\n", (const char *)key.dptr));
-                       /* continue even with errors */
-                       return 0;
-               }
-
-               /* Try a UID record. */
-               if (sscanf((const char *)value.dptr, "UID %u", &(maps[num_maps].xid.id)) == 1) {
-                       maps[num_maps].xid.type = ID_TYPE_UID;
-                       maps[num_maps].status = ID_MAPPED;
-                       *data->num_maps = num_maps + 1;
-
-               /* Try a GID record. */
-               } else
-               if (sscanf((const char *)value.dptr, "GID %u", &(maps[num_maps].xid.id)) == 1) {
-                       maps[num_maps].xid.type = ID_TYPE_GID;
-                       maps[num_maps].status = ID_MAPPED;
-                       *data->num_maps = num_maps + 1;
-
-               /* Unknown record type ! */
-               } else {
-                       maps[num_maps].status = ID_UNKNOWN;
-                       DEBUG(2, ("Found INVALID record %s -> %s\n",
-                               (const char *)key.dptr, (const char *)value.dptr));
-                       /* do not increment num_maps */
-               }
-       }
-
-       return 0;
-}
-
-/**********************************
- Dump all mappings out
-**********************************/
-
-static NTSTATUS idmap_tdb_dump_data(struct idmap_domain *dom, struct id_map **maps, int *num_maps)
-{
-       struct idmap_tdb_context *ctx;
-       struct dump_data *data;
-       NTSTATUS ret = NT_STATUS_OK;
-
-       ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
-
-       data = TALLOC_ZERO_P(ctx, struct dump_data);
-       if ( ! data) {
-               DEBUG(0, ("Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-       data->maps = maps;
-       data->num_maps = num_maps;
-       data->ret = NT_STATUS_OK;
-
-       tdb_traverse(ctx->tdb, idmap_tdb_dump_one_entry, data);
-
-       if ( ! NT_STATUS_IS_OK(data->ret)) {
-               ret = data->ret;
-       }
-
-       talloc_free(data);
-       return ret;
-}
-
 static struct idmap_methods db_methods = {
-
        .init = idmap_tdb_db_init,
        .unixids_to_sids = idmap_tdb_unixids_to_sids,
        .sids_to_unixids = idmap_tdb_sids_to_unixids,
-       .set_mapping = idmap_tdb_set_mapping,
-       .remove_mapping = idmap_tdb_remove_mapping,
-       .dump_data = idmap_tdb_dump_data,
+       .allocate_id = idmap_tdb_get_new_id,
        .close_fn = idmap_tdb_close
 };
 
-static struct idmap_alloc_methods db_alloc_methods = {
-
-       .init = idmap_tdb_alloc_init,
-       .allocate_id = idmap_tdb_allocate_id,
-       .get_id_hwm = idmap_tdb_get_hwm,
-       .set_id_hwm = idmap_tdb_set_hwm,
-       .close_fn = idmap_tdb_alloc_close
-};
-
-NTSTATUS idmap_alloc_tdb_init(void)
-{
-       return smb_register_idmap_alloc(SMB_IDMAP_INTERFACE_VERSION, "tdb", &db_alloc_methods);
-}
-
 NTSTATUS idmap_tdb_init(void)
 {
-       NTSTATUS ret;
-
        DEBUG(10, ("calling idmap_tdb_init\n"));
 
-       /* FIXME: bad hack to actually register also the alloc_tdb module without changining configure.in */
-       ret = idmap_alloc_tdb_init();
-       if (! NT_STATUS_IS_OK(ret)) {
-               return ret;
-       }
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "tdb", &db_methods);
 }