#define IDMAP_VERSION 2
+struct idmap_tdb_context {
+ struct db_context *db;
+};
+
/* High water mark keys */
#define HWM_GROUP "GROUP HWM"
#define HWM_USER "USER HWM"
Convert the idmap database from an older version.
*****************************************************************************/
-static bool idmap_tdb_upgrade(struct db_context *db)
+static bool idmap_tdb_upgrade(struct idmap_domain *dom, struct db_context *db)
{
int32 vers;
bool bigendianheader;
if (wm != -1) {
wm = IREV(wm);
} else {
- wm = idmap_tdb_state.low_uid;
+ wm = dom->low_id;
}
if (dbwrap_store_int32(db, HWM_USER, wm) == -1) {
if (wm != -1) {
wm = IREV(wm);
} else {
- wm = idmap_tdb_state.low_gid;
+ wm = dom->low_id;
}
if (dbwrap_store_int32(db, HWM_GROUP, wm) == -1) {
return True;
}
-static NTSTATUS idmap_tdb_load_ranges(void)
+static NTSTATUS idmap_tdb_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;
+ int ret;
+ uint32_t low_uid;
+ uint32_t low_gid;
+ bool update_uid = false;
+ bool update_gid = false;
+ struct idmap_tdb_context *ctx;
- if (!lp_idmap_uid(&low_uid, &high_uid)) {
- DEBUG(1, ("idmap uid missing\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ 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;
}
- if (!lp_idmap_gid(&low_gid, &high_gid)) {
- DEBUG(1, ("idmap gid missing\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ low_gid = dbwrap_fetch_int32(ctx->db, HWM_GROUP);
+ if (low_gid == -1 || low_gid < dom->low_id) {
+ update_gid = true;
}
- 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 (!update_uid && !update_gid) {
+ return NT_STATUS_OK;
+ }
- if (idmap_tdb_state.high_uid <= idmap_tdb_state.low_uid) {
- DEBUG(1, ("idmap uid range missing or invalid\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ if (ctx->db->transaction_start(ctx->db) != 0) {
+ DEBUG(0, ("Unable to start upgrade transaction!\n"));
+ return NT_STATUS_INTERNAL_DB_ERROR;
}
- if (idmap_tdb_state.high_gid <= idmap_tdb_state.low_gid) {
- DEBUG(1, ("idmap gid range missing or invalid\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ 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(TALLOC_CTX *memctx,
- bool check_config,
- struct db_context **dbctx)
+static NTSTATUS idmap_tdb_open_db(struct idmap_domain *dom)
{
NTSTATUS ret;
- TALLOC_CTX *ctx;
+ TALLOC_CTX *mem_ctx;
char *tdbfile = NULL;
struct db_context *db = NULL;
int32_t version;
bool config_error = false;
+ struct idmap_tdb_context *ctx;
- ret = idmap_tdb_load_ranges();
- if (!NT_STATUS_IS_OK(ret)) {
- config_error = true;
- if (check_config) {
- return ret;
- }
- }
+ ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
/* use our own context here */
- ctx = talloc_stackframe();
+ mem_ctx = talloc_stackframe();
/* use the old database if present */
tdbfile = state_path("winbindd_idmap.tdb");
DEBUG(10,("Opening tdbfile %s\n", tdbfile ));
/* Open idmap repository */
- db = db_open(ctx, 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 (!idmap_tdb_upgrade(db)) {
+ 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;
}
}
- *dbctx = talloc_move(memctx, &db);
+ ctx->db = talloc_move(ctx, &db);
ret = NT_STATUS_OK;
done:
- talloc_free(ctx);
+ talloc_free(mem_ctx);
return ret;
}
static struct db_context *idmap_alloc_db;
/**********************************
- Initialise idmap alloc database.
+ Allocate a new id.
**********************************/
-static NTSTATUS idmap_tdb_alloc_init( const char *params )
-{
- int ret;
- NTSTATUS status;
- uint32_t low_uid;
- uint32_t low_gid;
- bool update_uid = false;
- bool update_gid = false;
-
- status = idmap_tdb_open_db(NULL, true, &idmap_alloc_db);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("idmap will be unable to map foreign SIDs: %s\n",
- nt_errstr(status)));
- return status;
- }
+struct idmap_tdb_allocate_id_context {
+ const char *hwmkey;
+ const char *hwmtype;
+ uint32_t high_hwm;
+ uint32_t hwm;
+};
- low_uid = dbwrap_fetch_int32(idmap_alloc_db, HWM_USER);
- if (low_uid == -1 || low_uid < idmap_tdb_state.low_uid) {
- update_uid = true;
- }
+static NTSTATUS idmap_tdb_allocate_id_action(struct db_context *db,
+ void *private_data)
+{
+ NTSTATUS ret;
+ struct idmap_tdb_allocate_id_context *state;
+ uint32_t hwm;
- low_gid = dbwrap_fetch_int32(idmap_alloc_db, HWM_GROUP);
- if (low_gid == -1 || low_gid < idmap_tdb_state.low_gid) {
- update_gid = true;
- }
+ state = (struct idmap_tdb_allocate_id_context *)private_data;
- if (!update_uid && !update_gid) {
- return NT_STATUS_OK;
+ hwm = dbwrap_fetch_int32(db, state->hwmkey);
+ if (hwm == -1) {
+ ret = NT_STATUS_INTERNAL_DB_ERROR;
+ goto done;
}
- if (idmap_alloc_db->transaction_start(idmap_alloc_db) != 0) {
- TALLOC_FREE(idmap_alloc_db);
- DEBUG(0, ("Unable to start upgrade transaction!\n"));
- return NT_STATUS_INTERNAL_DB_ERROR;
+ /* 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 (update_uid) {
- ret = dbwrap_store_int32(idmap_alloc_db, HWM_USER,
- idmap_tdb_state.low_uid);
- if (ret == -1) {
- idmap_alloc_db->transaction_cancel(idmap_alloc_db);
- TALLOC_FREE(idmap_alloc_db);
- DEBUG(0, ("Unable to initialise user hwm in idmap "
- "database\n"));
- return NT_STATUS_INTERNAL_DB_ERROR;
- }
+ /* 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 (update_gid) {
- ret = dbwrap_store_int32(idmap_alloc_db, HWM_GROUP,
- idmap_tdb_state.low_gid);
- if (ret == -1) {
- idmap_alloc_db->transaction_cancel(idmap_alloc_db);
- TALLOC_FREE(idmap_alloc_db);
- DEBUG(0, ("Unable to initialise group 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 (idmap_alloc_db->transaction_commit(idmap_alloc_db) != 0) {
- TALLOC_FREE(idmap_alloc_db);
- DEBUG(0, ("Unable to commit upgrade transaction!\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)
{
- NTSTATUS ret;
const char *hwmkey;
const char *hwmtype;
uint32_t high_hwm;
- uint32_t hwm;
- int res;
+ uint32_t hwm = 0;
+ NTSTATUS status;
+ struct idmap_tdb_allocate_id_context state;
/* Get current high water mark */
switch (xid->type) {
return NT_STATUS_INVALID_PARAMETER;
}
- res = idmap_alloc_db->transaction_start(idmap_alloc_db);
- if (res != 0) {
- DEBUG(1, (__location__ " Failed to start transaction.\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
+ state.hwm = hwm;
+ state.high_hwm = high_hwm;
+ state.hwmtype = hwmtype;
+ state.hwmkey = hwmkey;
- if ((hwm = dbwrap_fetch_int32(idmap_alloc_db, hwmkey)) == -1) {
- idmap_alloc_db->transaction_cancel(idmap_alloc_db);
- return NT_STATUS_INTERNAL_DB_ERROR;
- }
+ status = dbwrap_trans_do(idmap_alloc_db, idmap_tdb_allocate_id_action,
+ &state);
- /* 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_alloc_db->transaction_cancel(idmap_alloc_db);
- return NT_STATUS_UNSUCCESSFUL;
+ 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));
}
- /* fetch a new id and increment it */
- ret = dbwrap_change_uint32_atomic(idmap_alloc_db, hwmkey, &hwm, 1);
- if (!NT_STATUS_IS_OK(ret)) {
- DEBUG(0, ("Fatal error while fetching a new %s value: %s\n!",
- hwmtype, nt_errstr(ret)));
- idmap_alloc_db->transaction_cancel(idmap_alloc_db);
- return ret;
- }
+ return status;
+}
- /* 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_alloc_db->transaction_cancel(idmap_alloc_db);
- return NT_STATUS_UNSUCCESSFUL;
- }
+/**
+ * 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;
- res = idmap_alloc_db->transaction_commit(idmap_alloc_db);
- if (res != 0) {
- DEBUG(1, (__location__ " Failed to commit transaction.\n"));
- return NT_STATUS_UNSUCCESSFUL;
+ 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));
+ ret = idmap_tdb_allocate_id(id);
- return NT_STATUS_OK;
+ return ret;
}
/**********************************
/**********************************************************************
IDMAP MAPPING TDB BACKEND
**********************************************************************/
-
-struct idmap_tdb_context {
- struct db_context *db;
- uint32_t filter_low_id;
- uint32_t filter_high_id;
-};
/*****************************
Initialise idmap database.
return NT_STATUS_NO_MEMORY;
}
+ /* load backend specific configuration here: */
+#if 0
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"));
- }
} 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"));
- ret = NT_STATUS_NO_MEMORY;
- 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;
- }
-
- talloc_free(config_option);
- }
-
- if (ctx->filter_low_id > ctx->filter_high_id) {
- ctx->filter_low_id = 0;
- ctx->filter_high_id = 0;
}
+#endif
- DEBUG(10, ("idmap_tdb_db_init: filter range %u-%u loaded for domain "
- "'%s'\n", ctx->filter_low_id, ctx->filter_high_id, dom->name));
+ dom->private_data = ctx;
- ret = idmap_tdb_open_db(ctx, false, &ctx->db);
+ ret = idmap_tdb_open_db(dom);
if ( ! NT_STATUS_IS_OK(ret)) {
goto failed;
}
- dom->private_data = ctx;
-
return NT_STATUS_OK;
failed:
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;
}
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;
+ struct idmap_tdb_context *ctx;
TALLOC_CTX *tmp_ctx = talloc_stackframe();
+ ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
+
keystr = sid_string_talloc(tmp_ctx, map->sid);
if (keystr == NULL) {
DEBUG(0, ("Out of memory!\n"));
}
/* 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;
}
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 */
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]);
+ ret = idmap_tdb_sid_to_id(dom, ids[i]);
if ( ! NT_STATUS_IS_OK(ret)) {
/* if it is just a failed mapping continue */
}
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,
+ .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,
- .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);
}
git.samba.org / amitay / samba.git / blobdiff