#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"
-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_load_ranges(void)
+/*
+ * check and initialize high/low water marks in the db
+ */
+static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom)
{
- 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;
- }
+ uint32 low_id;
- 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;
+ /* Create high water marks for group and user id */
- 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;
+ 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,
+ 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;
+ 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,
+ dom->low_id))) {
+ DEBUG(0, ("Unable to initialise group hwm in idmap "
+ "database\n"));
+ return NT_STATUS_INTERNAL_DB_ERROR;
+ }
}
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;
return NT_STATUS_UNSUCCESSFUL;
}
- /* load the ranges and high/low water marks */
- return idmap_tdb2_alloc_load();
-}
-
-
-/*
- load the idmap allocation ranges and high/low water marks
-*/
-static NTSTATUS idmap_tdb2_alloc_load(void)
-{
- NTSTATUS status;
- uint32 low_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));
- }
-
- /* load ranges */
-
- status = idmap_tdb2_load_ranges();
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
- /* Create high water marks for group and user id */
-
- low_id = dbwrap_fetch_int32(idmap_tdb2, HWM_USER);
- if ((low_id == -1) || (low_id < idmap_tdb2_state.low_uid)) {
- if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
- idmap_tdb2, HWM_USER,
- idmap_tdb2_state.low_uid))) {
- DEBUG(0, ("Unable to initialise user hwm in idmap "
- "database\n"));
- return NT_STATUS_INTERNAL_DB_ERROR;
- }
- }
-
- low_id = dbwrap_fetch_int32(idmap_tdb2, HWM_GROUP);
- if ((low_id == -1) || (low_id < idmap_tdb2_state.low_gid)) {
- if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
- idmap_tdb2, HWM_GROUP,
- idmap_tdb2_state.low_gid))) {
- DEBUG(0, ("Unable to initialise group hwm in idmap "
- "database\n"));
- return NT_STATUS_INTERNAL_DB_ERROR;
- }
- }
-
- return NT_STATUS_OK;
-}
-
-
-/*
- 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;
+ return idmap_tdb2_init_hwm(dom);
}
return ret;
}
-static NTSTATUS idmap_tdb2_allocate_id(struct unixid *xid)
+static NTSTATUS idmap_tdb2_allocate_id(struct idmap_domain *dom,
+ struct unixid *xid)
{
const char *hwmkey;
const char *hwmtype;
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 */
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:
return NT_STATUS_INVALID_PARAMETER;
}
+ high_hwm = dom->high_id;
+
state.hwm = hwm;
state.high_hwm = high_hwm;
state.hwmtype = hwmtype;
if (NT_STATUS_IS_OK(status)) {
xid->id = state.hwm;
- DEBUG(10,("New %s = %d\n", hwmtype, hwm));
+ DEBUG(10,("New %s = %d\n", hwmtype, state.hwm));
} else {
DEBUG(1, ("Error allocating a new %s\n", hwmtype));
}
return status;
}
-/*
- Get current highest id.
-*/
-static NTSTATUS idmap_tdb2_get_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)
{
- const char *hwmkey;
- const char *hwmtype;
- uint32_t hwm;
- uint32_t high_hwm;
- 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:
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- if ((hwm = dbwrap_fetch_int32(idmap_tdb2, hwmkey)) == -1) {
- return NT_STATUS_INTERNAL_DB_ERROR;
- }
-
- xid->id = hwm;
+ NTSTATUS ret;
- /* 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 (!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;
}
- return NT_STATUS_OK;
-}
-
-/*
- Set high id.
-*/
-static NTSTATUS idmap_tdb2_set_hwm(struct unixid *xid)
-{
- /* 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;
-}
+ ret = idmap_tdb2_allocate_id(dom, id);
-/*
- Close the alloc tdb
-*/
-static NTSTATUS idmap_tdb2_alloc_close(void)
-{
- /* don't actually close it */
- return NT_STATUS_OK;
+ return ret;
}
/*
IDMAP MAPPING TDB BACKEND
*/
-struct idmap_tdb2_context {
- uint32_t filter_low_id;
- uint32_t filter_high_id;
-};
/*
Initialise idmap database.
struct idmap_tdb2_context *ctx;
NTSTATUS status;
- status = idmap_tdb2_open_db();
- NT_STATUS_NOT_OK_RETURN(status);
-
- ctx = talloc(dom, struct idmap_tdb2_context);
+ ctx = talloc_zero(dom, struct idmap_tdb2_context);
if ( ! ctx) {
DEBUG(0, ("Out of memory!\n"));
return NT_STATUS_NO_MEMORY;
}
if (strequal(dom->name, "*")) {
- uid_t low_uid = 0;
- uid_t high_uid = 0;
- gid_t low_gid = 0;
- gid_t high_gid = 0;
-
- ctx->filter_low_id = 0;
- ctx->filter_high_id = 0;
-
- if (lp_idmap_uid(&low_uid, &high_uid)) {
- ctx->filter_low_id = low_uid;
- ctx->filter_high_id = high_uid;
- } else {
- DEBUG(3, ("Warning: 'idmap uid' not set!\n"));
- }
-
- if (lp_idmap_gid(&low_gid, &high_gid)) {
- if ((low_gid != low_uid) || (high_gid != high_uid)) {
- DEBUG(1, ("Warning: 'idmap uid' and 'idmap gid'"
- " ranges do not agree -- building "
- "intersection\n"));
- ctx->filter_low_id = MAX(ctx->filter_low_id,
- low_gid);
- ctx->filter_high_id = MIN(ctx->filter_high_id,
- high_gid);
- }
- } else {
- DEBUG(3, ("Warning: 'idmap gid' not set!\n"));
+ 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;
- const char *range;
+
config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
if ( ! config_option) {
DEBUG(0, ("Out of memory!\n"));
goto failed;
}
- 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 = 0;
- ctx->filter_high_id = 0;
+ 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);
}
- if (ctx->filter_low_id > ctx->filter_high_id) {
- ctx->filter_low_id = 0;
- ctx->filter_high_id = 0;
- }
-
dom->private_data = ctx;
+ ret = idmap_tdb2_open_db(dom);
+ if (!NT_STATUS_IS_OK(ret)) {
+ goto failed;
+ }
+
return NT_STATUS_OK;
failed:
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);
} 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;
}
/*
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;
}
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;
}
/*
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;
+ struct idmap_tdb2_context *ctx;
TALLOC_CTX *tmp_ctx = talloc_stackframe();
- ret = idmap_tdb2_open_db();
+ ret = idmap_tdb2_open_db(dom);
NT_STATUS_NOT_OK_RETURN(ret);
+ ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
+
keystr = sid_string_talloc(tmp_ctx, map->sid);
if (keystr == NULL) {
DEBUG(0, ("Out of memory!\n"));
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;
}
}
/* 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, ("Script returned 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;
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;
}
*/
static NTSTATUS idmap_tdb2_unixids_to_sids(struct idmap_domain *dom, struct id_map **ids)
{
- struct idmap_tdb2_context *ctx;
NTSTATUS ret;
int i;
ids[i]->status = ID_UNKNOWN;
}
- ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
-
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 */
/*
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;
/* 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_tdb2_context);
-
- for (i = 0; ids[i]; i++) {
- ret = idmap_tdb2_sid_to_id(ctx, ids[i]);
- if ( ! NT_STATUS_IS_OK(ret)) {
+ state.dom = dom;
+ state.ids = ids;
+ state.allocate_unmapped = false;
- /* if it is just a failed mapping continue */
- if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
+ ret = idmap_tdb2_sids_to_unixids_action(idmap_tdb2, &state);
- /* make sure it is marked as unmapped */
- ids[i]->status = ID_UNMAPPED;
- continue;
- }
-
- /* some fatal error occurred, return immediately */
- goto done;
- }
-
- /* 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;
}
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;
return ret;
}
-/*
- remove a mapping.
-*/
-static NTSTATUS idmap_tdb2_remove_mapping(struct idmap_domain *dom, const struct id_map *map)
+/**
+ * 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)
{
- /* 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;
+ NTSTATUS ret;
+ char *sidstr;
+ TDB_DATA data;
+ TALLOC_CTX *mem_ctx = talloc_stackframe();
+
+ if (map == NULL) {
+ ret = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ if ((map->xid.type != ID_TYPE_UID) && (map->xid.type != ID_TYPE_GID)) {
+ ret = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ if (map->sid == NULL) {
+ ret = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ /* 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;
+ }
+
+ data = dbwrap_fetch_bystring(idmap_tdb2, mem_ctx, sidstr);
+ if (data.dptr) {
+ ret = NT_STATUS_OBJECT_NAME_COLLISION;
+ goto done;
+ }
+
+ /* 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, ("Setting mapping: %s <-> %s %lu\n",
+ sid_string_dbg(map->sid),
+ (map->xid.type == ID_TYPE_UID) ? "UID" : "GID",
+ (unsigned long)map->xid.id));
+
+ 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)));
+ }
+
+done:
+ talloc_free(mem_ctx);
+ return ret;
}
/*
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);
}
git.samba.org / amitay / samba.git / blobdiff