s3:idmap_tdb2: give idmap_tdb2_alloc_load() and idmap domain arguemnt
[amitay/samba.git] / source3 / winbindd / idmap_tdb2.c
index 911f80c6a3e17e8dbfbe21121a6d4dea258033f1..dba5690bfbad5532f7506c5b3efc12a126d90ad7 100644 (file)
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    Copyright (C) Jeremy Allison 2006
    Copyright (C) Simo Sorce 2003-2006
-   
+
    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
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
+struct idmap_tdb2_context {
+       const char *script; /* script to provide idmaps */
+};
+
 /* High water mark keys */
 #define HWM_GROUP  "GROUP HWM"
 #define HWM_USER   "USER HWM"
@@ -44,23 +48,61 @@ static struct idmap_tdb2_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 */
-       const char *idmap_script;
 } idmap_tdb2_state;
 
 
+static NTSTATUS idmap_tdb2_new_mapping(struct idmap_domain *dom,
+                                      struct id_map *map);
 
 /* handle to the permanent tdb */
 static struct db_context *idmap_tdb2;
 
-static NTSTATUS idmap_tdb2_alloc_load(void);
+static NTSTATUS idmap_tdb2_alloc_load(struct idmap_domain *dom);
+
+static NTSTATUS idmap_tdb2_load_ranges(void)
+{
+       uid_t low_uid = 0;
+       uid_t high_uid = 0;
+       gid_t low_gid = 0;
+       gid_t high_gid = 0;
+
+       if (!lp_idmap_uid(&low_uid, &high_uid)) {
+               DEBUG(1, ("idmap uid missing\n"));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (!lp_idmap_gid(&low_gid, &high_gid)) {
+               DEBUG(1, ("idmap gid missing\n"));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       idmap_tdb2_state.low_uid = low_uid;
+       idmap_tdb2_state.high_uid = high_uid;
+       idmap_tdb2_state.low_gid = low_gid;
+       idmap_tdb2_state.high_gid = high_gid;
+
+       if (idmap_tdb2_state.high_uid <= idmap_tdb2_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;
+       }
+
+       if (idmap_tdb2_state.high_gid <= idmap_tdb2_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;
+       }
+
+       return NT_STATUS_OK;
+}
 
 /*
   open the permanent tdb
  */
-static NTSTATUS idmap_tdb2_open_db(void)
+static NTSTATUS idmap_tdb2_open_db(struct idmap_domain *dom)
 {
        char *db_path;
-       
+
        if (idmap_tdb2) {
                /* its already open */
                return NT_STATUS_OK;
@@ -85,75 +127,43 @@ static NTSTATUS idmap_tdb2_open_db(void)
        }
 
        /* load the ranges and high/low water marks */
-       return idmap_tdb2_alloc_load();
+       return idmap_tdb2_alloc_load(dom);
 }
 
 
 /*
   load the idmap allocation ranges and high/low water marks
 */
-static NTSTATUS idmap_tdb2_alloc_load(void)
+static NTSTATUS idmap_tdb2_alloc_load(struct idmap_domain *dom)
 {
-       const char *range;
-       uid_t low_uid = 0;
-       uid_t high_uid = 0;
-       gid_t low_gid = 0;
-       gid_t high_gid = 0;
-       uint32 low_id, high_id;
-
-       /* see if a idmap script is configured */
-       idmap_tdb2_state.idmap_script = lp_parm_const_string(-1, "idmap",
-                                                            "script", NULL);
-
-       if (idmap_tdb2_state.idmap_script) {
-               DEBUG(1, ("using idmap script '%s'\n",
-                         idmap_tdb2_state.idmap_script));
-       }
+       NTSTATUS status;
+       uint32 low_id;
 
        /* load ranges */
 
-       /* Create high water marks for group and user id */
-       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;
+       status = idmap_tdb2_load_ranges();
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       idmap_tdb2_state.low_uid = low_uid;
-       idmap_tdb2_state.high_uid = high_uid;
-       idmap_tdb2_state.low_gid = low_gid;
-       idmap_tdb2_state.high_gid = high_gid;
-
-       if (idmap_tdb2_state.high_uid <= idmap_tdb2_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;
-       }
+       /* Create high water marks for group and user id */
 
-       if (((low_id = dbwrap_fetch_int32(idmap_tdb2,
-                                         HWM_USER)) == -1) ||
-           (low_id < idmap_tdb2_state.low_uid)) {
+       low_id = dbwrap_fetch_int32(idmap_tdb2, HWM_USER);
+       if ((low_id == -1) || (low_id < dom->low_id)) {
                if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
                                             idmap_tdb2, HWM_USER,
-                                            idmap_tdb2_state.low_uid))) {
+                                            dom->low_id))) {
                        DEBUG(0, ("Unable to initialise user hwm in idmap "
                                  "database\n"));
                        return NT_STATUS_INTERNAL_DB_ERROR;
                }
        }
 
-       if (idmap_tdb2_state.high_gid <= idmap_tdb2_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;
-       }
-
-       if (((low_id = dbwrap_fetch_int32(idmap_tdb2,
-                                         HWM_GROUP)) == -1) ||
-           (low_id < idmap_tdb2_state.low_gid)) {
+       low_id = dbwrap_fetch_int32(idmap_tdb2, HWM_GROUP);
+       if ((low_id == -1) || (low_id < dom->low_id)) {
                if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
                                             idmap_tdb2, HWM_GROUP,
-                                            idmap_tdb2_state.low_gid))) {
+                                            dom->low_id))) {
                        DEBUG(0, ("Unable to initialise group hwm in idmap "
                                  "database\n"));
                        return NT_STATUS_INTERNAL_DB_ERROR;
@@ -164,113 +174,74 @@ static NTSTATUS idmap_tdb2_alloc_load(void)
 }
 
 
-/*
-  Initialise idmap alloc database. 
-*/
-static NTSTATUS idmap_tdb2_alloc_init(const char *params)
-{
-       /* nothing to do - we want to avoid opening the permanent
-          database if possible. Instead we load the params when we
-          first need it. */
-       return NT_STATUS_OK;
-}
-
-
 /*
   Allocate a new id. 
 */
-static NTSTATUS idmap_tdb2_allocate_id(struct unixid *xid)
-{
-       bool ret;
+
+struct idmap_tdb2_allocate_id_context {
        const char *hwmkey;
        const char *hwmtype;
        uint32_t high_hwm;
        uint32_t hwm;
-       int res;
-       NTSTATUS status;
-
-       status = idmap_tdb2_open_db();
-       NT_STATUS_NOT_OK_RETURN(status);
-
-       /* Get current high water mark */
-       switch (xid->type) {
-
-       case ID_TYPE_UID:
-               hwmkey = HWM_USER;
-               hwmtype = "UID";
-               high_hwm = idmap_tdb2_state.high_uid;
-               break;
-
-       case ID_TYPE_GID:
-               hwmkey = HWM_GROUP;
-               hwmtype = "GID";
-               high_hwm = idmap_tdb2_state.high_gid;
-               break;
+};
 
-       default:
-               DEBUG(2, ("Invalid ID type (0x%x)\n", xid->type));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
+static NTSTATUS idmap_tdb2_allocate_id_action(struct db_context *db,
+                                             void *private_data)
+{
+       NTSTATUS ret;
+       struct idmap_tdb2_allocate_id_context *state;
+       uint32_t hwm;
 
-       res = idmap_tdb2->transaction_start(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to start transaction\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       state = (struct idmap_tdb2_allocate_id_context *)private_data;
 
-       if ((hwm = dbwrap_fetch_int32(idmap_tdb2, hwmkey)) == -1) {
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_INTERNAL_DB_ERROR;
+       hwm = dbwrap_fetch_int32(db, state->hwmkey);
+       if (hwm == -1) {
+               ret = NT_STATUS_INTERNAL_DB_ERROR;
+               goto done;
        }
 
        /* 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));
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_UNSUCCESSFUL;
+       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;
        }
 
        /* fetch a new id and increment it */
-       ret = dbwrap_change_uint32_atomic(idmap_tdb2, hwmkey, &hwm, 1);
-       if (ret == -1) {
-               DEBUG(1, ("Fatal error while fetching a new %s value\n!", hwmtype));
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_UNSUCCESSFUL;
+       ret = dbwrap_trans_change_uint32_atomic(db, state->hwmkey, &hwm, 1);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(1, ("Fatal error while fetching a new %s value\n!",
+                         state->hwmtype));
+               goto done;
        }
 
        /* 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));
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_UNSUCCESSFUL;
+       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;
        }
 
-       res = idmap_tdb2->transaction_commit(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to commit transaction\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-       
-       xid->id = hwm;
-       DEBUG(10,("New %s = %d\n", hwmtype, hwm));
+       ret = NT_STATUS_OK;
+       state->hwm = hwm;
 
-       return NT_STATUS_OK;
+done:
+       return ret;
 }
 
-/*
-  Get current highest id. 
-*/
-static NTSTATUS idmap_tdb2_get_hwm(struct unixid *xid)
+static NTSTATUS idmap_tdb2_allocate_id(struct idmap_domain *dom,
+                                      struct unixid *xid)
 {
        const char *hwmkey;
        const char *hwmtype;
-       uint32_t hwm;
        uint32_t high_hwm;
+       uint32_t hwm = 0;
        NTSTATUS status;
+       struct idmap_tdb2_allocate_id_context state;
 
-       status = idmap_tdb2_open_db();
+       status = idmap_tdb2_open_db(dom);
        NT_STATUS_NOT_OK_RETURN(status);
 
        /* Get current high water mark */
@@ -279,61 +250,65 @@ static NTSTATUS idmap_tdb2_get_hwm(struct unixid *xid)
        case ID_TYPE_UID:
                hwmkey = HWM_USER;
                hwmtype = "UID";
-               high_hwm = idmap_tdb2_state.high_uid;
                break;
 
        case ID_TYPE_GID:
                hwmkey = HWM_GROUP;
                hwmtype = "GID";
-               high_hwm = idmap_tdb2_state.high_gid;
                break;
 
        default:
+               DEBUG(2, ("Invalid ID type (0x%x)\n", xid->type));
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if ((hwm = dbwrap_fetch_int32(idmap_tdb2, hwmkey)) == -1) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
+       high_hwm = dom->high_id;
+
+       state.hwm = hwm;
+       state.high_hwm = high_hwm;
+       state.hwmtype = hwmtype;
+       state.hwmkey = hwmkey;
 
-       xid->id = hwm;
+       status = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_allocate_id_action,
+                                &state);
 
-       /* 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));
+       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));
        }
 
-       return NT_STATUS_OK;
+       return status;
 }
 
-/*
-  Set high id. 
-*/
-static NTSTATUS idmap_tdb2_set_hwm(struct unixid *xid)
+/**
+ * Allocate a new unix-ID.
+ * For now this is for the default idmap domain only.
+ * Should be extended later on.
+ */
+static NTSTATUS idmap_tdb2_get_new_id(struct idmap_domain *dom,
+                                     struct unixid *id)
 {
-       /* not supported, or we would invalidate the cache tdb on
-          other nodes */
-       DEBUG(0,("idmap_tdb2_set_hwm not supported\n"));
-       return NT_STATUS_NOT_SUPPORTED;
-}
+       NTSTATUS ret;
 
-/*
-  Close the alloc tdb 
-*/
-static NTSTATUS idmap_tdb2_alloc_close(void)
-{
-       /* don't actually close it */
-       return NT_STATUS_OK;
+       if (!strequal(dom->name, "*")) {
+               DEBUG(3, ("idmap_tdb2_get_new_id: "
+                         "Refusing creation of mapping for domain'%s'. "
+                         "Currently only supported for the default "
+                         "domain \"*\".\n",
+                          dom->name));
+               return NT_STATUS_NOT_IMPLEMENTED;
+       }
+
+       ret = idmap_tdb2_allocate_id(dom, id);
+
+       return ret;
 }
 
 /*
   IDMAP MAPPING TDB BACKEND
 */
-struct idmap_tdb2_context {
-       uint32_t filter_low_id;
-       uint32_t filter_high_id;
-};
 
 /*
   Initialise idmap database. 
@@ -343,37 +318,44 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom,
 {
        NTSTATUS ret;
        struct idmap_tdb2_context *ctx;
-       char *config_option = NULL;
-       const char *range;
        NTSTATUS status;
 
-       status = idmap_tdb2_open_db();
-       NT_STATUS_NOT_OK_RETURN(status);
-
        ctx = talloc(dom, struct idmap_tdb2_context);
        if ( ! ctx) {
                DEBUG(0, ("Out of memory!\n"));
                return NT_STATUS_NO_MEMORY;
        }
 
-       config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
-       if ( ! config_option) {
-               DEBUG(0, ("Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto failed;
-       }
+       if (strequal(dom->name, "*")) {
+               ctx->script = lp_parm_const_string(-1, "idmap", "script", NULL);
+               if (ctx->script) {
+                       DEBUG(1, ("using idmap script '%s'\n", ctx->script));
+               }
+       } else {
+               char *config_option = NULL;
 
-       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;
+               config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
+               if ( ! config_option) {
+                       DEBUG(0, ("Out of memory!\n"));
+                       ret = NT_STATUS_NO_MEMORY;
+                       goto failed;
+               }
+
+               ctx->script = lp_parm_const_string(-1, config_option, "script", NULL);
+               if (ctx->script) {
+                       DEBUG(1, ("using idmap script '%s'\n", ctx->script));
+               }
+
+               talloc_free(config_option);
        }
 
        dom->private_data = ctx;
 
-       talloc_free(config_option);
+       ret = idmap_tdb2_open_db(dom);
+       if (!NT_STATUS_IS_OK(ret)) {
+               goto failed;
+       }
+
        return NT_STATUS_OK;
 
 failed:
@@ -381,6 +363,55 @@ failed:
        return ret;
 }
 
+struct idmap_tdb2_set_mapping_context {
+       const char *ksidstr;
+       const char *kidstr;
+};
+
+static NTSTATUS idmap_tdb2_set_mapping_action(struct db_context *db,
+                                             void *private_data)
+{
+       TDB_DATA data;
+       NTSTATUS ret;
+       struct idmap_tdb2_set_mapping_context *state;
+       TALLOC_CTX *tmp_ctx = talloc_stackframe();
+
+       state = (struct idmap_tdb2_set_mapping_context *)private_data;
+
+       DEBUG(10, ("Storing %s <-> %s map\n", state->ksidstr, state->kidstr));
+
+       /* check wheter sid mapping is already present in db */
+       data = dbwrap_fetch_bystring(db, tmp_ctx, state->ksidstr);
+       if (data.dptr) {
+               ret = NT_STATUS_OBJECT_NAME_COLLISION;
+               goto done;
+       }
+
+       ret = dbwrap_store_bystring(db, state->ksidstr,
+                                   string_term_tdb_data(state->kidstr),
+                                   TDB_INSERT);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0, ("Error storing SID -> ID: %s\n", nt_errstr(ret)));
+               goto done;
+       }
+
+       ret = dbwrap_store_bystring(db, state->kidstr,
+                                   string_term_tdb_data(state->ksidstr),
+                                   TDB_INSERT);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0, ("Error storing ID -> SID: %s\n", nt_errstr(ret)));
+               /* try to remove the previous stored SID -> ID map */
+               dbwrap_delete_bystring(db, state->ksidstr);
+               goto done;
+       }
+
+       DEBUG(10,("Stored %s <-> %s\n", state->ksidstr, state->kidstr));
+
+done:
+       talloc_free(tmp_ctx);
+       return ret;
+}
+
 
 /*
   run a script to perform a mapping
@@ -406,7 +437,7 @@ static NTSTATUS idmap_tdb2_script(struct idmap_tdb2_context *ctx, struct id_map
        char line[64];
        unsigned long v;
 
-       cmd = talloc_asprintf(ctx, "%s ", idmap_tdb2_state.idmap_script);
+       cmd = talloc_asprintf(ctx, "%s ", ctx->script);
        NT_STATUS_HAVE_NO_MEMORY(cmd);  
 
        va_start(ap, fmt);
@@ -437,12 +468,12 @@ static NTSTATUS idmap_tdb2_script(struct idmap_tdb2_context *ctx, struct id_map
        } else if (strncmp(line, "SID:S-", 6) == 0) {
                if (!string_to_sid(map->sid, &line[4])) {
                        DEBUG(0,("Bad SID in '%s' from idmap script %s\n",
-                                line, idmap_tdb2_state.idmap_script));
+                                line, ctx->script));
                        return NT_STATUS_NONE_MAPPED;                   
                }
        } else {
                DEBUG(0,("Bad reply '%s' from idmap script %s\n",
-                        line, idmap_tdb2_state.idmap_script));
+                        line, ctx->script));
                return NT_STATUS_NONE_MAPPED;
        }
 
@@ -454,25 +485,28 @@ static NTSTATUS idmap_tdb2_script(struct idmap_tdb2_context *ctx, struct id_map
 /*
   Single id to sid lookup function. 
 */
-static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_map *map)
+static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_domain *dom, struct id_map *map)
 {
        NTSTATUS ret;
        TDB_DATA data;
        char *keystr;
        NTSTATUS status;
+       struct idmap_tdb2_context *ctx;
 
-       status = idmap_tdb2_open_db();
-       NT_STATUS_NOT_OK_RETURN(status);
 
-       if (!ctx || !map) {
+       if (!dom || !map) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
+       status = idmap_tdb2_open_db(dom);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_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;
        }
 
@@ -481,7 +515,7 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
        case ID_TYPE_UID:
                keystr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
                break;
-               
+
        case ID_TYPE_GID:
                keystr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
                break;
@@ -506,10 +540,11 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
        data = dbwrap_fetch_bystring(idmap_tdb2, keystr, keystr);
 
        if (!data.dptr) {
-               fstring sidstr;
+               char *sidstr;
+               struct idmap_tdb2_set_mapping_context store_state;
 
                DEBUG(10,("Record %s not found\n", keystr));
-               if (idmap_tdb2_state.idmap_script == NULL) {
+               if (ctx->script == NULL) {
                        ret = NT_STATUS_NONE_MAPPED;
                        goto done;
                }
@@ -521,18 +556,20 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
                        goto done;
                }
 
-               if (sid_to_fstring(sidstr, map->sid)) {
-                       /* both forward and reverse mappings */
-                       dbwrap_store_bystring(idmap_tdb2, keystr,
-                                           string_term_tdb_data(sidstr), 
-                                           TDB_REPLACE);
-                       dbwrap_store_bystring(idmap_tdb2, sidstr,
-                                           string_term_tdb_data(keystr), 
-                                           TDB_REPLACE);
+               sidstr = sid_string_talloc(keystr, map->sid);
+               if (!sidstr) {
+                       ret = NT_STATUS_NO_MEMORY;
+                       goto done;
                }
+
+               store_state.ksidstr = sidstr;
+               store_state.kidstr = keystr;
+
+               ret = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_set_mapping_action,
+                                     &store_state);
                goto done;
        }
-               
+
        if (!string_to_sid(map->sid, (const char *)data.dptr)) {
                DEBUG(10,("INVALID SID (%s) in record %s\n",
                        (const char *)data.dptr, keystr));
@@ -552,18 +589,22 @@ done:
 /*
  Single sid to id lookup function. 
 */
-static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_tdb2_context *ctx, struct id_map *map)
+static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_domain *dom, struct id_map *map)
 {
        NTSTATUS ret;
        TDB_DATA data;
        char *keystr;
        unsigned long rec_id = 0;
-       NTSTATUS status;
+       struct idmap_tdb2_context *ctx;
+       TALLOC_CTX *tmp_ctx = talloc_stackframe();
 
-       status = idmap_tdb2_open_db();
-       NT_STATUS_NOT_OK_RETURN(status);
+       ret = idmap_tdb2_open_db(dom);
+       NT_STATUS_NOT_OK_RETURN(ret);
+
+       ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
 
-       if ((keystr = sid_string_talloc(ctx, 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;
@@ -572,31 +613,46 @@ static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_tdb2_context *ctx, struct id_m
        DEBUG(10,("Fetching record %s\n", keystr));
 
        /* Check if sid is present in database */
-       data = dbwrap_fetch_bystring(idmap_tdb2, keystr, keystr);
+       data = dbwrap_fetch_bystring(idmap_tdb2, tmp_ctx, keystr);
        if (!data.dptr) {
-               fstring idstr;
+               char *idstr;
+               struct idmap_tdb2_set_mapping_context store_state;
 
                DEBUG(10,(__location__ " Record %s not found\n", keystr));
 
-               if (idmap_tdb2_state.idmap_script == NULL) {
+               if (ctx->script == NULL) {
                        ret = NT_STATUS_NONE_MAPPED;
                        goto done;
                }
-                       
+
                ret = idmap_tdb2_script(ctx, map, "SIDTOID %s", keystr);
                /* store it on shared storage */
                if (!NT_STATUS_IS_OK(ret)) {
                        goto done;
                }
 
-               snprintf(idstr, sizeof(idstr), "%cID %lu", 
-                        map->xid.type == ID_TYPE_UID?'U':'G',
-                        (unsigned long)map->xid.id);
-               /* store both forward and reverse mappings */
-               dbwrap_store_bystring(idmap_tdb2, keystr, string_term_tdb_data(idstr),
-                                   TDB_REPLACE);
-               dbwrap_store_bystring(idmap_tdb2, idstr, string_term_tdb_data(keystr),
-                                   TDB_REPLACE);
+               /* apply filters before returning result */
+               if (!idmap_unix_id_is_in_range(map->xid.id, dom)) {
+                       DEBUG(5, ("Script returned id (%u) out of range "
+                                 "(%u - %u). Filtered!\n",
+                                 map->xid.id, dom->low_id, dom->high_id));
+                       ret = NT_STATUS_NONE_MAPPED;
+                       goto done;
+               }
+
+               idstr = talloc_asprintf(tmp_ctx, "%cID %lu",
+                                       map->xid.type == ID_TYPE_UID?'U':'G',
+                                       (unsigned long)map->xid.id);
+               if (idstr == NULL) {
+                       ret = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               store_state.ksidstr = keystr;
+               store_state.kidstr = idstr;
+
+               ret = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_set_mapping_action,
+                                     &store_state);
                goto done;
        }
 
@@ -616,18 +672,18 @@ static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_tdb2_context *ctx, struct id_m
        } 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;
        }
-       
+
        /* 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;
 }
 
@@ -636,14 +692,16 @@ done:
 */
 static NTSTATUS idmap_tdb2_unixids_to_sids(struct idmap_domain *dom, struct id_map **ids)
 {
-       struct idmap_tdb2_context *ctx;
        NTSTATUS ret;
        int i;
 
-       ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
+       /* initialize the status to avoid suprise */
+       for (i = 0; ids[i]; i++) {
+               ids[i]->status = ID_UNKNOWN;
+       }
 
        for (i = 0; ids[i]; i++) {
-               ret = idmap_tdb2_id_to_sid(ctx, ids[i]);
+               ret = idmap_tdb2_id_to_sid(dom, ids[i]);
                if ( ! NT_STATUS_IS_OK(ret)) {
 
                        /* if it is just a failed mapping continue */
@@ -653,7 +711,7 @@ static NTSTATUS idmap_tdb2_unixids_to_sids(struct idmap_domain *dom, struct id_m
                                ids[i]->status = ID_UNMAPPED;
                                continue;
                        }
-                       
+
                        /* some fatal error occurred, return immediately */
                        goto done;
                }
@@ -671,37 +729,92 @@ done:
 /*
   lookup a set of sids. 
 */
+
+struct idmap_tdb2_sids_to_unixids_context {
+       struct idmap_domain *dom;
+       struct id_map **ids;
+       bool allocate_unmapped;
+};
+
+static NTSTATUS idmap_tdb2_sids_to_unixids_action(struct db_context *db,
+                                                 void *private_data)
+{
+       struct idmap_tdb2_sids_to_unixids_context *state;
+       int i;
+       NTSTATUS ret = NT_STATUS_OK;
+
+       state = (struct idmap_tdb2_sids_to_unixids_context *)private_data;
+
+       DEBUG(10, ("idmap_tdb2_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_tdb2_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;
+                       }
+               }
+
+               if ((state->ids[i]->status == ID_UNMAPPED) &&
+                   state->allocate_unmapped)
+               {
+                       ret = idmap_tdb2_new_mapping(state->dom, state->ids[i]);
+                       if (!NT_STATUS_IS_OK(ret)) {
+                               goto done;
+                       }
+               }
+       }
+
+done:
+       return ret;
+}
+
 static NTSTATUS idmap_tdb2_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
-       struct idmap_tdb2_context *ctx;
        NTSTATUS ret;
        int i;
+       struct idmap_tdb2_sids_to_unixids_context state;
 
-       ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
-
+       /* initialize the status to avoid suprise */
        for (i = 0; ids[i]; i++) {
-               ret = idmap_tdb2_sid_to_id(ctx, ids[i]);
-               if ( ! NT_STATUS_IS_OK(ret)) {
+               ids[i]->status = ID_UNKNOWN;
+       }
 
-                       /* if it is just a failed mapping continue */
-                       if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
+       state.dom = dom;
+       state.ids = ids;
+       state.allocate_unmapped = false;
 
-                               /* make sure it is marked as unmapped */
-                               ids[i]->status = ID_UNMAPPED;
-                               continue;
-                       }
-                       
-                       /* some fatal error occurred, return immediately */
-                       goto done;
-               }
+       ret = idmap_tdb2_sids_to_unixids_action(idmap_tdb2, &state);
 
-               /* all ok, id is mapped */
-               ids[i]->status = ID_MAPPED;
+       if (NT_STATUS_EQUAL(ret, STATUS_SOME_UNMAPPED) && !dom->read_only) {
+               state.allocate_unmapped = true;
+               ret = dbwrap_trans_do(idmap_tdb2,
+                                     idmap_tdb2_sids_to_unixids_action,
+                                     &state);
        }
 
-       ret = NT_STATUS_OK;
-
-done:
        return ret;
 }
 
@@ -709,14 +822,13 @@ done:
 /*
   set a mapping. 
 */
+
 static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id_map *map)
 {
        struct idmap_tdb2_context *ctx;
        NTSTATUS ret;
-       TDB_DATA data;
        char *ksidstr, *kidstr;
-       int res;
-       bool started_transaction = false;
+       struct idmap_tdb2_set_mapping_context state;
 
        if (!map || !map->sid) {
                return NT_STATUS_INVALID_PARAMETER;
@@ -725,7 +837,7 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id
        ksidstr = kidstr = NULL;
 
        /* TODO: should we filter a set_mapping using low/high filters ? */
-       
+
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
 
        switch (map->xid.type) {
@@ -733,7 +845,7 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id
        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;
@@ -749,75 +861,93 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id
                goto done;
        }
 
-       if (!(ksidstr = sid_string_talloc(ctx, map->sid))) {
+       ksidstr = sid_string_talloc(ctx, map->sid);
+       if (ksidstr == NULL) {
                DEBUG(0, ("Out of memory!\n"));
                ret = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       DEBUG(10, ("Storing %s <-> %s map\n", ksidstr, kidstr));
+       state.ksidstr = ksidstr;
+       state.kidstr = kidstr;
 
-       res = idmap_tdb2->transaction_start(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to start transaction\n"));
-               ret = NT_STATUS_UNSUCCESSFUL;
+       ret = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_set_mapping_action,
+                             &state);
+
+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_tdb2_new_mapping(struct idmap_domain *dom, struct id_map *map)
+{
+       NTSTATUS ret;
+       char *sidstr;
+       TDB_DATA data;
+       TALLOC_CTX *mem_ctx = talloc_stackframe();
+
+       if (map == NULL) {
+               ret = NT_STATUS_INVALID_PARAMETER;
                goto done;
        }
 
-       started_transaction = true;
-       
-       /* check wheter sid mapping is already present in db */
-       data = dbwrap_fetch_bystring(idmap_tdb2, ksidstr, ksidstr);
-       if (data.dptr) {
-               ret = NT_STATUS_OBJECT_NAME_COLLISION;
+       if ((map->xid.type != ID_TYPE_UID) && (map->xid.type != ID_TYPE_GID)) {
+               ret = NT_STATUS_INVALID_PARAMETER;
                goto done;
        }
 
-       ret = dbwrap_store_bystring(idmap_tdb2, ksidstr, string_term_tdb_data(kidstr),
-                                 TDB_INSERT);
-       if (!NT_STATUS_IS_OK(ret)) {
-               DEBUG(0, ("Error storing SID -> ID: %s\n", nt_errstr(ret)));
+       if (map->sid == NULL) {
+               ret = NT_STATUS_INVALID_PARAMETER;
                goto done;
        }
-       ret = dbwrap_store_bystring(idmap_tdb2, kidstr, string_term_tdb_data(ksidstr),
-                                 TDB_INSERT);
-       if (!NT_STATUS_IS_OK(ret)) {
-               DEBUG(0, ("Error storing ID -> SID: %s\n", nt_errstr(ret)));
-               /* try to remove the previous stored SID -> ID map */
-               dbwrap_delete_bystring(idmap_tdb2, ksidstr);
+
+       /* check wheter the SID is already mapped in the db */
+       sidstr = sid_string_talloc(mem_ctx, map->sid);
+       if (sidstr == NULL) {
+               DEBUG(0, ("Out of memory!\n"));
+               ret = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       started_transaction = false;
+       data = dbwrap_fetch_bystring(idmap_tdb2, mem_ctx, sidstr);
+       if (data.dptr) {
+               ret = NT_STATUS_OBJECT_NAME_COLLISION;
+               goto done;
+       }
 
-       res = idmap_tdb2->transaction_commit(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to commit transaction\n"));
-               ret = NT_STATUS_UNSUCCESSFUL;
+       /* unmapped - get a new id */
+       ret = idmap_tdb2_get_new_id(dom, &map->xid);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(3, ("Could not allocate id: %s\n", nt_errstr(ret)));
                goto done;
        }
 
-       DEBUG(10,("Stored %s <-> %s\n", ksidstr, kidstr));
-       ret = NT_STATUS_OK;
+       DEBUG(10, ("Setting mapping: %s <-> %s %lu\n",
+                  sid_string_dbg(map->sid),
+                  (map->xid.type == ID_TYPE_UID) ? "UID" : "GID",
+                  (unsigned long)map->xid.id));
 
-done:
-       if (started_transaction) {
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
+       map->status = ID_MAPPED;
+
+       /* store the mapping */
+       ret = idmap_tdb2_set_mapping(dom, map);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(3, ("Could not store the new mapping: %s\n",
+                         nt_errstr(ret)));
        }
-       talloc_free(ksidstr);
-       talloc_free(kidstr);
-       return ret;
-}
 
-/*
-  remove a mapping. 
-*/
-static NTSTATUS idmap_tdb2_remove_mapping(struct idmap_domain *dom, const struct id_map *map)
-{
-       /* not supported as it would invalidate the cache tdb on other
-          nodes */
-       DEBUG(0,("idmap_tdb2_remove_mapping not supported\n"));
-       return NT_STATUS_NOT_SUPPORTED;
+done:
+       talloc_free(mem_ctx);
+       return ret;
 }
 
 /*
@@ -829,44 +959,15 @@ static NTSTATUS idmap_tdb2_close(struct idmap_domain *dom)
        return NT_STATUS_OK;
 }
 
-
-/*
-  Dump all mappings out
-*/
-static NTSTATUS idmap_tdb2_dump_data(struct idmap_domain *dom, struct id_map **maps, int *num_maps)
-{
-       DEBUG(0,("idmap_tdb2_dump_data not supported\n"));
-       return NT_STATUS_NOT_SUPPORTED;
-}
-
 static struct idmap_methods db_methods = {
        .init            = idmap_tdb2_db_init,
        .unixids_to_sids = idmap_tdb2_unixids_to_sids,
        .sids_to_unixids = idmap_tdb2_sids_to_unixids,
-       .set_mapping     = idmap_tdb2_set_mapping,
-       .remove_mapping  = idmap_tdb2_remove_mapping,
-       .dump_data       = idmap_tdb2_dump_data,
+       .allocate_id     = idmap_tdb2_get_new_id,
        .close_fn        = idmap_tdb2_close
 };
 
-static struct idmap_alloc_methods db_alloc_methods = {
-       .init        = idmap_tdb2_alloc_init,
-       .allocate_id = idmap_tdb2_allocate_id,
-       .get_id_hwm  = idmap_tdb2_get_hwm,
-       .set_id_hwm  = idmap_tdb2_set_hwm,
-       .close_fn    = idmap_tdb2_alloc_close
-};
-
 NTSTATUS idmap_tdb2_init(void)
 {
-       NTSTATUS ret;
-
-       /* register both backends */
-       ret = smb_register_idmap_alloc(SMB_IDMAP_INTERFACE_VERSION, "tdb2", &db_alloc_methods);
-       if (! NT_STATUS_IS_OK(ret)) {
-               DEBUG(0, ("Unable to register idmap alloc tdb2 module: %s\n", get_friendly_nt_error_msg(ret)));
-               return ret;
-       }
-
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "tdb2", &db_methods);
 }