*
*/
-#include "includes.h"
-#include "system/filesys.h"
+/*
+ * This module allocates ranges for domains to be used in a
+ * algorithmic mode like idmap_rid. Multiple ranges are supported
+ * for a single domain: If a rid exceeds the range size, a matching
+ * range is allocated to hold the rid's id.
+ *
+ * Here are the formulas applied:
+ *
+ *
+ * For a sid of the form domain_sid-rid, we have
+ *
+ * rid = reduced_rid + domain_range_index * range_size
+ *
+ * with
+ * reduced_rid := rid % range_size
+ * domain_range_index := rid / range_size
+ *
+ * And reduced_rid fits into a range.
+ *
+ * In the database, we associate a range_number to
+ * the pair domain_sid,domain_range_index.
+ *
+ * Now the unix id for the given sid calculates as:
+ *
+ * id = reduced_rid + range_low_id
+ *
+ * with
+ *
+ * range_low_id = low_id + range_number * range_size
+ *
+ *
+ * The inverse calculation goes like this:
+ *
+ * Given a unix id, let
+ *
+ * normalized_id := id - low_id
+ * reduced_rid := normalized_id % range_size
+ * range_number = normalized_id / range_size
+ *
+ * Then we have
+ *
+ * id = reduced_rid + low_id + range_number * range_size
+ *
+ * From the database, get the domain_sid,domain_range_index pair
+ * belonging to the range_number (if there is already one).
+ *
+ * Then the rid for the unix id calculates as:
+ *
+ * rid = reduced_rid + domain_range_index * range_size
+ */
+
+#include "idmap_autorid_tdb.h"
#include "winbindd.h"
-#include "dbwrap/dbwrap.h"
-#include "dbwrap/dbwrap_open.h"
#include "idmap.h"
#include "idmap_rw.h"
#include "../libcli/security/dom_sid.h"
-#include "util_tdb.h"
-#include "winbindd/idmap_tdb_common.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_IDMAP
-#define HWM "NEXT RANGE"
-#define ALLOC_HWM_UID "NEXT ALLOC UID"
-#define ALLOC_HWM_GID "NEXT ALLOC GID"
-#define ALLOC_RANGE "ALLOC"
-#define CONFIGKEY "CONFIG"
-
-struct autorid_global_config {
- uint32_t minvalue;
- uint32_t rangesize;
- uint32_t maxranges;
-};
-
-struct autorid_domain_config {
- fstring sid;
- uint32_t domainnum;
- struct autorid_global_config *globalcfg;
-};
-
/* handle to the tdb storing domain <-> range assignments */
static struct db_context *autorid_db;
-static NTSTATUS idmap_autorid_get_domainrange_action(struct db_context *db,
- void *private_data)
-{
- NTSTATUS ret;
- uint32_t domainnum, hwm;
- char *numstr;
- struct autorid_domain_config *cfg;
-
- cfg = (struct autorid_domain_config *)private_data;
-
- ret = dbwrap_fetch_uint32(db, cfg->sid, &(cfg->domainnum));
-
- if (NT_STATUS_IS_OK(ret)) {
- /* entry is already present*/
- return ret;
- }
-
- DEBUG(10, ("Acquiring new range for domain %s\n", cfg->sid));
-
- /* fetch the current HWM */
- ret = dbwrap_fetch_uint32(db, HWM, &hwm);
- if (!NT_STATUS_IS_OK(ret)) {
- DEBUG(1, ("Fatal error while fetching current "
- "HWM value: %s\n", nt_errstr(ret)));
- ret = NT_STATUS_INTERNAL_ERROR;
- goto error;
- }
-
- /* do we have a range left? */
- if (hwm >= cfg->globalcfg->maxranges) {
- DEBUG(1, ("No more domain ranges available!\n"));
- ret = NT_STATUS_NO_MEMORY;
- goto error;
- }
-
- /* increase the HWM */
- ret = dbwrap_change_uint32_atomic(db, HWM, &domainnum, 1);
- if (!NT_STATUS_IS_OK(ret)) {
- DEBUG(1, ("Fatal error while fetching a new "
- "domain range value!\n"));
- goto error;
- }
-
- /* store away the new mapping in both directions */
- ret = dbwrap_store_uint32(db, cfg->sid, domainnum);
- if (!NT_STATUS_IS_OK(ret)) {
- DEBUG(1, ("Fatal error while storing new "
- "domain->range assignment!\n"));
- goto error;
- }
-
- numstr = talloc_asprintf(db, "%u", domainnum);
- if (!numstr) {
- ret = NT_STATUS_NO_MEMORY;
- goto error;
- }
-
- ret = dbwrap_store_bystring(db, numstr,
- string_term_tdb_data(cfg->sid), TDB_INSERT);
-
- talloc_free(numstr);
- if (!NT_STATUS_IS_OK(ret)) {
- DEBUG(1, ("Fatal error while storing "
- "new domain->range assignment!\n"));
- goto error;
- }
- DEBUG(5, ("Acquired new range #%d for domain %s\n",
- domainnum, cfg->sid));
-
- cfg->domainnum = domainnum;
-
- return NT_STATUS_OK;
-
-error:
- return ret;
-
-}
+static bool ignore_builtin = false;
-static NTSTATUS idmap_autorid_get_domainrange(struct autorid_domain_config *dom,
- bool read_only)
+static NTSTATUS idmap_autorid_get_alloc_range(struct idmap_domain *dom,
+ struct autorid_range_config *range)
{
- NTSTATUS ret;
+ NTSTATUS status;
- /*
- * try to find mapping without locking the database,
- * if it is not found create a mapping in a transaction unless
- * read-only mode has been set
- */
- ret = dbwrap_fetch_uint32(autorid_db, dom->sid, &(dom->domainnum));
+ ZERO_STRUCT(*range);
- if (!NT_STATUS_IS_OK(ret)) {
- if (read_only) {
- return NT_STATUS_NOT_FOUND;
- }
- ret = dbwrap_trans_do(autorid_db,
- idmap_autorid_get_domainrange_action, dom);
- }
+ fstrcpy(range->domsid, ALLOC_RANGE);
- DEBUG(10, ("Using range #%d for domain %s\n", dom->domainnum,
- dom->sid));
+ status = idmap_autorid_get_domainrange(autorid_db,
+ range,
+ dom->read_only);
- return ret;
+ return status;
}
static NTSTATUS idmap_autorid_allocate_id(struct idmap_domain *dom,
struct unixid *xid) {
NTSTATUS ret;
- struct idmap_tdb_common_context *commoncfg;
- struct autorid_global_config *globalcfg;
- struct autorid_domain_config domaincfg;
-
- commoncfg =
- talloc_get_type_abort(dom->private_data,
- struct idmap_tdb_common_context);
-
- globalcfg = talloc_get_type(commoncfg->private_data,
- struct autorid_global_config);
+ struct autorid_range_config range;
if (dom->read_only) {
DEBUG(3, ("Backend is read-only, refusing "
/* fetch the range for the allocation pool */
- ZERO_STRUCT(domaincfg);
-
- domaincfg.globalcfg = globalcfg;
- fstrcpy(domaincfg.sid, ALLOC_RANGE);
-
- ret = idmap_autorid_get_domainrange(&domaincfg, dom->read_only);
-
+ ret = idmap_autorid_get_alloc_range(dom, &range);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(3, ("Could not determine range for allocation pool, "
"check previous messages for reason\n"));
return ret;
}
- xid->id = globalcfg->minvalue +
- globalcfg->rangesize * domaincfg.domainnum +
- xid->id;
+ xid->id = xid->id + range.low_id;
DEBUG(10, ("Returned new %s %d from allocation range\n",
(xid->type==ID_TYPE_UID)?"uid":"gid", xid->id));
/*
* map a SID to xid using the idmap_tdb like pool
*/
-static NTSTATUS idmap_autorid_map_id_to_sid(struct idmap_domain *dom,
- struct id_map *map)
+static NTSTATUS idmap_autorid_id_to_sid_alloc(struct idmap_domain *dom,
+ struct id_map *map)
{
NTSTATUS ret;
struct idmap_domain *dom,
struct id_map *map)
{
- uint32_t range;
- TDB_DATA data;
+ uint32_t range_number;
+ uint32_t domain_range_index = 0;
+ uint32_t normalized_id;
+ uint32_t reduced_rid;
+ uint32_t rid;
+ TDB_DATA data = tdb_null;
char *keystr;
- struct dom_sid sid;
+ struct dom_sid domsid;
NTSTATUS status;
+ bool ok;
+ const char *q = NULL;
/* can this be one of our ids? */
if (map->xid.id < cfg->minvalue) {
}
/* determine the range of this uid */
- range = ((map->xid.id - cfg->minvalue) / cfg->rangesize);
- keystr = talloc_asprintf(talloc_tos(), "%u", range);
+ normalized_id = map->xid.id - cfg->minvalue;
+ range_number = normalized_id / cfg->rangesize;
+
+ keystr = talloc_asprintf(talloc_tos(), "%u", range_number);
if (!keystr) {
return NT_STATUS_NO_MEMORY;
}
if (!NT_STATUS_IS_OK(status)) {
DEBUG(4, ("id %d belongs to range %d which does not have "
"domain mapping, ignoring mapping request\n",
- map->xid.id, range));
+ map->xid.id, range_number));
TALLOC_FREE(data.dptr);
map->status = ID_UNKNOWN;
return NT_STATUS_OK;
"checking for mapping\n",
map->xid.id));
TALLOC_FREE(data.dptr);
- return idmap_autorid_map_id_to_sid(dom, map);
+ return idmap_autorid_id_to_sid_alloc(dom, map);
}
- string_to_sid(&sid, (const char *)data.dptr);
+ ok = dom_sid_parse_endp((const char *)data.dptr, &domsid, &q);
TALLOC_FREE(data.dptr);
+ if (!ok) {
+ map->status = ID_UNKNOWN;
+ return NT_STATUS_OK;
+ }
+ if ((q != NULL) && (*q != '\0'))
+ if (sscanf(q+1, "%"SCNu32, &domain_range_index) != 1) {
+ DEBUG(10, ("Domain range index not found, "
+ "ignoring mapping request\n"));
+ map->status = ID_UNKNOWN;
+ return NT_STATUS_OK;
+ }
- sid_compose(map->sid, &sid,
- (map->xid.id - cfg->minvalue -
- range * cfg->rangesize));
+ reduced_rid = normalized_id % cfg->rangesize;
+ rid = reduced_rid + domain_range_index * cfg->rangesize;
+
+ sid_compose(map->sid, &domsid, rid);
/* We **really** should have some way of validating
the SID exists and is the correct type here. But
that is a deficiency in the idmap_rid design. */
map->status = ID_MAPPED;
+ map->xid.type = ID_TYPE_BOTH;
+
return NT_STATUS_OK;
}
Single sid to id lookup function.
**********************************/
-static NTSTATUS idmap_autorid_sid_to_id(struct autorid_global_config *global,
- struct autorid_domain_config *domain,
+static NTSTATUS idmap_autorid_sid_to_id_rid(
+ struct autorid_global_config *global,
+ struct autorid_range_config *range,
struct id_map *map)
{
uint32_t rid;
+ uint32_t reduced_rid;
sid_peek_rid(map->sid, &rid);
- /* if the rid is higher than the size of the range, we cannot map it */
- if (rid >= global->rangesize) {
- map->status = ID_UNKNOWN;
- DEBUG(2, ("RID %d is larger then size of range (%d), "
- "user cannot be mapped\n", rid, global->rangesize));
- return NT_STATUS_UNSUCCESSFUL;
- }
- map->xid.id = global->minvalue +
- (global->rangesize * domain->domainnum)+rid;
-
- /* We **really** should have some way of validating
- the SID exists and is the correct type here. But
- that is a deficiency in the idmap_rid design. */
+ reduced_rid = rid % global->rangesize;
+ map->xid.id = reduced_rid + range->low_id;
+ map->xid.type = ID_TYPE_BOTH;
map->status = ID_MAPPED;
return NT_STATUS_OK;
/*
* map a SID to xid using the idmap_tdb like pool
*/
-static NTSTATUS idmap_autorid_map_sid_to_id(struct idmap_domain *dom,
- struct id_map *map,
- struct idmap_tdb_common_context *ctx)
+static NTSTATUS idmap_autorid_sid_to_id_alloc(struct idmap_domain *dom,
+ struct id_map *map,
+ struct idmap_tdb_common_context *ctx)
{
NTSTATUS ret;
int res;
+ map->status = ID_UNKNOWN;
+
/* see if we already have a mapping */
ret = idmap_tdb_common_sid_to_unixid(dom, map);
/* bad things happened */
if (!NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
- DEBUG(1, ("Looking up SID->ID mapping for %s failed\n",
- sid_string_dbg(map->sid)));
+ DEBUG(1, ("Looking up SID->ID mapping for %s failed: %s\n",
+ sid_string_dbg(map->sid), nt_errstr(ret)));
return ret;
}
if (dom->read_only) {
DEBUG(3, ("Not allocating new mapping for %s, because backend "
"is read-only\n", sid_string_dbg(map->sid)));
+ map->status = ID_UNMAPPED;
return NT_STATUS_NONE_MAPPED;
}
sid_string_dbg(map->sid)));
/* create new mapping */
- dbwrap_transaction_start(ctx->db);
+ res = dbwrap_transaction_start(ctx->db);
+ if (res != 0) {
+ DEBUG(2, ("transaction_start failed\n"));
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ }
ret = idmap_tdb_common_new_mapping(dom, map);
-
- map->status = (NT_STATUS_IS_OK(ret))?ID_MAPPED:ID_UNMAPPED;
-
if (!NT_STATUS_IS_OK(ret)) {
if (dbwrap_transaction_cancel(ctx->db) != 0) {
smb_panic("Cancelling transaction failed");
}
+ map->status = ID_UNMAPPED;
return ret;
}
res = dbwrap_transaction_commit(ctx->db);
if (res == 0) {
- return ret;
+ map->status = ID_MAPPED;
+ return NT_STATUS_OK;
}
DEBUG(2, ("transaction_commit failed\n"));
for (i = 0; ids[i]; i++) {
struct winbindd_tdc_domain *domain;
- struct autorid_domain_config domaincfg;
+ struct autorid_range_config range;
uint32_t rid;
struct dom_sid domainsid;
- ZERO_STRUCT(domaincfg);
+ ZERO_STRUCT(range);
+
+ DEBUG(10, ("Trying to map %s\n", sid_string_dbg(ids[i]->sid)));
sid_copy(&domainsid, ids[i]->sid);
if (!sid_split_rid(&domainsid, &rid)) {
DEBUG(10, ("SID %s is well-known, using pool\n",
sid_string_dbg(ids[i]->sid)));
- ret = idmap_autorid_map_sid_to_id(dom, ids[i],
- commoncfg);
+ ret = idmap_autorid_sid_to_id_alloc(dom, ids[i],
+ commoncfg);
if (!NT_STATUS_IS_OK(ret) &&
!NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
goto failure;
}
- if (ids[i]->status == ID_MAPPED) {
+ if (NT_STATUS_IS_OK(ret) && ids[i]->status == ID_MAPPED) {
num_mapped++;
}
continue;
}
+ /* BUILTIN is passdb's job */
+ if (dom_sid_equal(&domainsid, &global_sid_Builtin) &&
+ ignore_builtin) {
+ DEBUG(10, ("Ignoring request for BUILTIN domain\n"));
+ continue;
+ }
+
/*
* Check if the domain is around
*/
}
TALLOC_FREE(domain);
- domaincfg.globalcfg = global;
- sid_to_fstring(domaincfg.sid, &domainsid);
+ sid_to_fstring(range.domsid, &domainsid);
- ret = idmap_autorid_get_domainrange(&domaincfg, dom->read_only);
+ /* Calculate domain_range_index for multi-range support */
+ range.domain_range_index = rid / (global->rangesize);
+
+ ret = idmap_autorid_get_domainrange(autorid_db, &range,
+ dom->read_only);
/* read-only mode and a new domain range would be required? */
if (NT_STATUS_EQUAL(ret, NT_STATUS_NOT_FOUND) &&
goto failure;
}
- ret = idmap_autorid_sid_to_id(global, &domaincfg, ids[i]);
+ ret = idmap_autorid_sid_to_id_rid(global, &range, ids[i]);
if ((!NT_STATUS_IS_OK(ret)) &&
(!NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED))) {
goto failure;
}
- if (NT_STATUS_IS_OK(ret)) {
+ if (NT_STATUS_IS_OK(ret) && ids[i]->status == ID_MAPPED) {
num_mapped++;
}
}
}
-/* initialize the given HWM to 0 if it does not exist yet */
-static NTSTATUS idmap_autorid_init_hwm(const char *hwm) {
-
- NTSTATUS status;
- uint32_t hwmval;
-
- status = dbwrap_fetch_uint32(autorid_db, hwm, &hwmval);
- if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
- status = dbwrap_trans_store_int32(autorid_db, hwm, 0);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0,
- ("Unable to initialise HWM (%s) in autorid "
- "database: %s\n", hwm, nt_errstr(status)));
- return NT_STATUS_INTERNAL_DB_ERROR;
- }
- } else if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("unable to fetch HWM (%s) from autorid "
- "database: %s\n", hwm, nt_errstr(status)));
- return status;
- }
-
- return NT_STATUS_OK;
-}
-
-/*
- * open and initialize the database which stores the ranges for the domains
- */
-static NTSTATUS idmap_autorid_db_init(void)
-{
- NTSTATUS status;
-
- if (autorid_db) {
- /* its already open */
- return NT_STATUS_OK;
- }
-
- /* Open idmap repository */
- autorid_db = db_open(NULL, state_path("autorid.tdb"), 0,
- TDB_DEFAULT, O_RDWR | O_CREAT, 0644,
- DBWRAP_LOCK_ORDER_1);
-
- if (!autorid_db) {
- DEBUG(0, ("Unable to open idmap_autorid database '%s'\n",
- state_path("autorid.tdb")));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- /* Initialize high water mark for the currently used range to 0 */
-
- status = idmap_autorid_init_hwm(HWM);
- NT_STATUS_NOT_OK_RETURN(status);
-
- status = idmap_autorid_init_hwm(ALLOC_HWM_UID);
- NT_STATUS_NOT_OK_RETURN(status);
-
- status = idmap_autorid_init_hwm(ALLOC_HWM_GID);
-
- return status;
-}
-
-static struct autorid_global_config *idmap_autorid_loadconfig(TALLOC_CTX * ctx)
-{
-
- TDB_DATA data;
- struct autorid_global_config *cfg;
- unsigned long minvalue, rangesize, maxranges;
- NTSTATUS status;
-
- status = dbwrap_fetch_bystring(autorid_db, ctx, CONFIGKEY, &data);
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10, ("No saved config found\n"));
- return NULL;
- }
-
- cfg = talloc_zero(ctx, struct autorid_global_config);
- if (!cfg) {
- return NULL;
- }
-
- if (sscanf((char *)data.dptr,
- "minvalue:%lu rangesize:%lu maxranges:%lu",
- &minvalue, &rangesize, &maxranges) != 3) {
- DEBUG(1,
- ("Found invalid configuration data"
- "creating new config\n"));
- return NULL;
- }
-
- cfg->minvalue = minvalue;
- cfg->rangesize = rangesize;
- cfg->maxranges = maxranges;
-
- DEBUG(10, ("Loaded previously stored configuration "
- "minvalue:%d rangesize:%d\n",
- cfg->minvalue, cfg->rangesize));
-
- return cfg;
-
-}
-
-static NTSTATUS idmap_autorid_saveconfig(struct autorid_global_config *cfg)
-{
-
- NTSTATUS status;
- TDB_DATA data;
- char *cfgstr;
-
- cfgstr =
- talloc_asprintf(talloc_tos(),
- "minvalue:%u rangesize:%u maxranges:%u",
- cfg->minvalue, cfg->rangesize, cfg->maxranges);
-
- if (!cfgstr) {
- return NT_STATUS_NO_MEMORY;
- }
-
- data = string_tdb_data(cfgstr);
-
- status = dbwrap_trans_store_bystring(autorid_db, CONFIGKEY,
- data, TDB_REPLACE);
-
- talloc_free(cfgstr);
-
- return status;
-}
-
static NTSTATUS idmap_autorid_preallocate_wellknown(struct idmap_domain *dom)
{
const char *groups[] = { "S-1-1-0", "S-1-2-0", "S-1-2-1",
return NT_STATUS_OK;
}
- num = sizeof(groups)/sizeof(char*);
+ num = ARRAY_SIZE(groups);
- maps = talloc_zero_array(talloc_tos(), struct id_map*, num+1);
+ maps = talloc_array(talloc_tos(), struct id_map*, num+1);
if (!maps) {
return NT_STATUS_NO_MEMORY;
}
for (i = 0; i < num; i++) {
maps[i] = talloc(maps, struct id_map);
+ if (maps[i] == NULL) {
+ talloc_free(maps);
+ return NT_STATUS_NO_MEMORY;
+ }
maps[i]->xid.type = ID_TYPE_GID;
maps[i]->sid = dom_sid_parse_talloc(maps, groups[i]);
}
return NT_STATUS_IS_OK(status)?NT_STATUS_OK:NT_STATUS_UNSUCCESSFUL;
}
+static NTSTATUS idmap_autorid_initialize_action(struct db_context *db,
+ void *private_data)
+{
+ struct idmap_domain *dom;
+ struct idmap_tdb_common_context *common;
+ struct autorid_global_config *config;
+ NTSTATUS status;
+
+ dom = (struct idmap_domain *)private_data;
+ common = (struct idmap_tdb_common_context *)dom->private_data;
+ config = (struct autorid_global_config *)common->private_data;
+
+ status = idmap_autorid_init_hwms(db);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ status = idmap_autorid_saveconfig(db, config);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to store configuration data!\n"));
+ return status;
+ }
+
+ status = idmap_autorid_preallocate_wellknown(dom);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to preallocate wellknown sids: %s\n",
+ nt_errstr(status)));
+ return status;
+ }
+
+ return NT_STATUS_OK;
+}
+
static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)
{
struct idmap_tdb_common_context *commonconfig;
struct autorid_global_config *config;
- struct autorid_global_config *storedconfig = NULL;
NTSTATUS status;
- uint32_t hwm;
if (!strequal(dom->name, "*")) {
DEBUG(0, ("idmap_autorid_initialize: Error: autorid configured "
DEBUG(0, ("Out of memory!\n"));
return NT_STATUS_NO_MEMORY;
}
+ dom->private_data = commonconfig;
commonconfig->rw_ops = talloc_zero(commonconfig, struct idmap_rw_ops);
if (commonconfig->rw_ops == NULL) {
DEBUG(0, ("Out of memory!\n"));
return NT_STATUS_NO_MEMORY;
}
-
- status = idmap_autorid_db_init();
- if (!NT_STATUS_IS_OK(status)) {
- goto error;
- }
+ commonconfig->private_data = config;
config->minvalue = dom->low_id;
config->rangesize = lp_parm_int(-1, "idmap config *",
"rangesize", 100000);
- if (config->rangesize < 2000) {
- DEBUG(1, ("autorid rangesize must be at least 2000\n"));
- status = NT_STATUS_INVALID_PARAMETER;
- goto error;
- }
-
config->maxranges = (dom->high_id - dom->low_id + 1) /
config->rangesize;
if (config->maxranges == 0) {
- DEBUG(1, ("allowed uid range is smaller then rangesize, "
- "increase uid range or decrease rangesize\n"));
+ DEBUG(1, ("Allowed uid range is smaller than rangesize. "
+ "Increase uid range or decrease rangesize.\n"));
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
config->maxranges));
}
- DEBUG(10, ("Current configuration in config is "
- "minvalue:%d rangesize:%d maxranges:%d\n",
- config->minvalue, config->rangesize, config->maxranges));
-
- /* read previously stored config and current HWM */
- storedconfig = idmap_autorid_loadconfig(talloc_tos());
-
- status = dbwrap_fetch_uint32(autorid_db, HWM, &hwm);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Fatal error while fetching current "
- "HWM value: %s\n", nt_errstr(status)));
- status = NT_STATUS_INTERNAL_ERROR;
- goto error;
- }
-
- /* did the minimum value or rangesize change? */
- if (storedconfig &&
- ((storedconfig->minvalue != config->minvalue) ||
- (storedconfig->rangesize != config->rangesize))) {
- DEBUG(1, ("New configuration values for rangesize or "
- "minimum uid value conflict with previously "
- "used values! Aborting initialization\n"));
- status = NT_STATUS_INVALID_PARAMETER;
- goto error;
- }
-
- /*
- * has the highest uid value been reduced to setting that is not
- * sufficient any more for already existing ranges?
- */
- if (hwm > config->maxranges) {
- DEBUG(1, ("New upper uid limit is too low to cover "
- "existing mappings! Aborting initialization\n"));
- status = NT_STATUS_INVALID_PARAMETER;
- goto error;
- }
-
- status = idmap_autorid_saveconfig(config);
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to store configuration data!\n"));
- goto error;
- }
-
DEBUG(5, ("%d domain ranges with a size of %d are available\n",
config->maxranges, config->rangesize));
+ ignore_builtin = lp_parm_bool(-1, "idmap config *",
+ "ignore builtin", false);
+
/* fill the TDB common configuration */
- commonconfig->private_data = config;
- commonconfig->db = autorid_db;
commonconfig->max_id = config->rangesize -1;
commonconfig->hwmkey_uid = ALLOC_HWM_UID;
commonconfig->hwmkey_gid = ALLOC_HWM_GID;
commonconfig->rw_ops->get_new_id = idmap_autorid_allocate_id;
commonconfig->rw_ops->set_mapping = idmap_tdb_common_set_mapping;
- dom->private_data = commonconfig;
+ status = idmap_autorid_db_open(state_path("autorid.tdb"),
+ NULL, /* TALLOC_CTX */
+ &autorid_db);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto error;
+ }
- /* preallocate well-known SIDs in the pool */
- status = idmap_autorid_preallocate_wellknown(dom);
+ commonconfig->db = autorid_db;
+
+ status = dbwrap_trans_do(autorid_db,
+ idmap_autorid_initialize_action,
+ dom);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to init the idmap database: %s\n",
+ nt_errstr(status)));
+ goto error;
+ }
goto done;
talloc_free(config);
done:
- talloc_free(storedconfig);
-
return status;
}
.allocate_id = idmap_autorid_allocate_id
};
-NTSTATUS samba_init_module(void)
+NTSTATUS idmap_autorid_init(void)
{
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION,
"autorid", &autorid_methods);
git.samba.org / obnox / samba / samba-obnox.git / blobdiff