*/
#include "includes.h"
+#include "system/filesys.h"
#include "utils/net.h"
+#include "secrets.h"
+#include "idmap.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "../libcli/security/security.h"
+#include "net_idmap_check.h"
+#include "util_tdb.h"
+#include "idmap_autorid_tdb.h"
#define ALLOC_CHECK(mem) do { \
if (!mem) { \
return -1; \
} } while(0)
+enum idmap_dump_backend {
+ TDB,
+ AUTORID
+};
+
+struct net_idmap_ctx {
+ enum idmap_dump_backend backend;
+};
+
+static int net_idmap_dump_one_autorid_entry(struct db_record *rec,
+ void *unused)
+{
+ TDB_DATA key;
+ TDB_DATA value;
+
+ key = dbwrap_record_get_key(rec);
+ value = dbwrap_record_get_value(rec);
+
+ if (strncmp((char *)key.dptr, "CONFIG", 6) == 0) {
+ char *config = talloc_array(talloc_tos(), char, value.dsize+1);
+ memcpy(config, value.dptr, value.dsize);
+ config[value.dsize] = '\0';
+ printf("CONFIG: %s\n", config);
+ talloc_free(config);
+ return 0;
+ }
+
+ if (strncmp((char *)key.dptr, "NEXT RANGE", 10) == 0) {
+ printf("RANGE HWM: %"PRIu32"\n", IVAL(value.dptr, 0));
+ return 0;
+ }
+
+ if (strncmp((char *)key.dptr, "NEXT ALLOC UID", 14) == 0) {
+ printf("UID HWM: %"PRIu32"\n", IVAL(value.dptr, 0));
+ return 0;
+ }
+
+ if (strncmp((char *)key.dptr, "NEXT ALLOC GID", 14) == 0) {
+ printf("GID HWM: %"PRIu32"\n", IVAL(value.dptr, 0));
+ return 0;
+ }
+
+ if (strncmp((char *)key.dptr, "UID", 3) == 0 ||
+ strncmp((char *)key.dptr, "GID", 3) == 0)
+ {
+ /* mapped entry from allocation pool */
+ printf("%s %s\n", value.dptr, key.dptr);
+ return 0;
+ }
+
+ if ((strncmp((char *)key.dptr, "S-1-5-", 6) == 0 ||
+ strncmp((char *)key.dptr, "ALLOC", 5) == 0) &&
+ value.dsize == sizeof(uint32_t))
+ {
+ /* this is a domain range assignment */
+ uint32_t range = IVAL(value.dptr, 0);
+ printf("RANGE %"PRIu32": %s\n", range, key.dptr);
+ return 0;
+ }
+
+ return 0;
+}
+
/***********************************************************
Helper function for net_idmap_dump. Dump one entry.
**********************************************************/
-static int net_idmap_dump_one_entry(TDB_CONTEXT *tdb,
- TDB_DATA key,
- TDB_DATA data,
- void *unused)
+static int net_idmap_dump_one_tdb_entry(struct db_record *rec,
+ void *unused)
{
+ TDB_DATA key;
+ TDB_DATA value;
+
+ key = dbwrap_record_get_key(rec);
+ value = dbwrap_record_get_value(rec);
+
if (strcmp((char *)key.dptr, "USER HWM") == 0) {
- printf(_("USER HWM %d\n"), IVAL(data.dptr,0));
+ printf(_("USER HWM %d\n"), IVAL(value.dptr,0));
return 0;
}
if (strcmp((char *)key.dptr, "GROUP HWM") == 0) {
- printf(_("GROUP HWM %d\n"), IVAL(data.dptr,0));
+ printf(_("GROUP HWM %d\n"), IVAL(value.dptr,0));
return 0;
}
- if (strncmp((char *)key.dptr, "S-", 2) != 0)
+ if (strncmp((char *)key.dptr, "S-", 2) != 0) {
return 0;
+ }
- printf("%s %s\n", data.dptr, key.dptr);
+ printf("%s %s\n", value.dptr, key.dptr);
return 0;
}
+static const char* net_idmap_dbfile(struct net_context *c,
+ struct net_idmap_ctx *ctx)
+{
+ const char* dbfile = NULL;
+ const char *backend = NULL;
+
+ backend = lp_idmap_default_backend();
+ if (!backend) {
+ d_printf(_("Internal error: 'idmap config * : backend' is not set!\n"));
+ return NULL;
+ }
+
+ if (c->opt_db != NULL) {
+ dbfile = talloc_strdup(talloc_tos(), c->opt_db);
+ if (dbfile == NULL) {
+ d_fprintf(stderr, _("Out of memory!\n"));
+ }
+ } else if (strequal(backend, "tdb")) {
+ dbfile = state_path("winbindd_idmap.tdb");
+ if (dbfile == NULL) {
+ d_fprintf(stderr, _("Out of memory!\n"));
+ }
+ ctx->backend = TDB;
+ } else if (strequal(backend, "tdb2")) {
+ dbfile = talloc_asprintf(talloc_tos(), "%s/idmap2.tdb",
+ lp_private_dir());
+ if (dbfile == NULL) {
+ d_fprintf(stderr, _("Out of memory!\n"));
+ }
+ ctx->backend = TDB;
+ } else if (strequal(backend, "autorid")) {
+ dbfile = state_path("autorid.tdb");
+ if (dbfile == NULL) {
+ d_fprintf(stderr, _("Out of memory!\n"));
+ }
+ ctx->backend = AUTORID;
+ } else {
+ char *_backend = talloc_strdup(talloc_tos(), backend);
+ char* args = strchr(_backend, ':');
+ if (args != NULL) {
+ *args = '\0';
+ }
+
+ d_printf(_("Sorry, 'idmap backend = %s' is currently not supported\n"),
+ _backend);
+
+ talloc_free(_backend);
+ }
+
+ return dbfile;
+}
+
+static bool net_idmap_opendb_autorid(TALLOC_CTX *mem_ctx,
+ struct net_context *c,
+ bool readonly,
+ struct db_context **db)
+{
+ bool ret = false;
+ const char *dbfile;
+ struct net_idmap_ctx ctx = { .backend = AUTORID };
+
+ if (c == NULL) {
+ goto done;
+ }
+
+ dbfile = net_idmap_dbfile(c, &ctx);
+ if (dbfile == NULL) {
+ goto done;
+ }
+
+ if (ctx.backend != AUTORID) {
+ d_fprintf(stderr, _("Unsupported backend\n"));
+ goto done;
+ }
+
+ if (readonly) {
+ *db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDONLY, 0,
+ DBWRAP_LOCK_ORDER_1);
+ if (*db == NULL) {
+ d_fprintf(stderr,
+ _("Could not open autorid db (%s): %s\n"),
+ dbfile, strerror(errno));
+ goto done;
+ }
+ } else {
+ NTSTATUS status;
+ status = idmap_autorid_db_init(dbfile, mem_ctx, db);
+ if (!NT_STATUS_IS_OK(status)) {
+ d_fprintf(stderr,
+ _("Error calling idmap_autorid_db_init: %s\n"),
+ nt_errstr(status));
+ goto done;
+ }
+ }
+
+ ret = true;
+
+done:
+ return ret;
+}
+
+
/***********************************************************
Dump the current idmap
**********************************************************/
static int net_idmap_dump(struct net_context *c, int argc, const char **argv)
{
- TDB_CONTEXT *idmap_tdb;
+ struct db_context *db;
+ TALLOC_CTX *mem_ctx;
+ const char* dbfile;
+ NTSTATUS status;
+ int ret = -1;
+ struct net_idmap_ctx ctx = { .backend = TDB };
- if ( argc != 1 || c->display_usage) {
- d_printf(_("Usage:\n"
- "net idmap dump <inputfile>\n"
+ if ( argc > 1 || c->display_usage) {
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net idmap dump [[--db=]<inputfile>]\n"
" Dump current ID mapping.\n"
" inputfile\tTDB file to read mappings from.\n"));
return c->display_usage?0:-1;
}
- idmap_tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0);
+ mem_ctx = talloc_stackframe();
- if (idmap_tdb == NULL) {
- d_fprintf(stderr, _("Could not open idmap: %s\n"), argv[0]);
- return -1;
+ dbfile = (argc > 0) ? argv[0] : net_idmap_dbfile(c, &ctx);
+ if (dbfile == NULL) {
+ goto done;
+ }
+ d_fprintf(stderr, _("dumping id mapping from %s\n"), dbfile);
+
+ db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDONLY, 0,
+ DBWRAP_LOCK_ORDER_1);
+ if (db == NULL) {
+ d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"),
+ dbfile, strerror(errno));
+ goto done;
}
- tdb_traverse(idmap_tdb, net_idmap_dump_one_entry, NULL);
+ if (ctx.backend == AUTORID) {
+ status = dbwrap_traverse_read(db,
+ net_idmap_dump_one_autorid_entry,
+ NULL, NULL);
+ } else {
+ status = dbwrap_traverse_read(db,
+ net_idmap_dump_one_tdb_entry,
+ NULL, NULL);
+ }
+ if (!NT_STATUS_IS_OK(status)) {
+ d_fprintf(stderr, _("error traversing the database\n"));
+ ret = -1;
+ goto done;
+ }
- tdb_close(idmap_tdb);
+ ret = 0;
- return 0;
+done:
+ talloc_free(mem_ctx);
+ return ret;
}
/***********************************************************
Write entries from stdin to current local idmap
**********************************************************/
+static int net_idmap_store_id_mapping(struct db_context *db,
+ enum id_type type,
+ unsigned long idval,
+ const char *sid_string)
+{
+ NTSTATUS status;
+ char *idstr = NULL;
+
+ switch(type) {
+ case ID_TYPE_UID:
+ idstr = talloc_asprintf(talloc_tos(), "UID %lu", idval);
+ break;
+ case ID_TYPE_GID:
+ idstr = talloc_asprintf(talloc_tos(), "GID %lu", idval);
+ break;
+ default:
+ d_fprintf(stderr, "Invalid id mapping type: %d\n", type);
+ return -1;
+ }
+
+ status = dbwrap_store_bystring(db, idstr,
+ string_term_tdb_data(sid_string),
+ TDB_REPLACE);
+ if (!NT_STATUS_IS_OK(status)) {
+ d_fprintf(stderr, "Error storing ID -> SID: "
+ "%s\n", nt_errstr(status));
+ talloc_free(idstr);
+ return -1;
+ }
+ status = dbwrap_store_bystring(db, sid_string,
+ string_term_tdb_data(idstr),
+ TDB_REPLACE);
+ if (!NT_STATUS_IS_OK(status)) {
+ d_fprintf(stderr, "Error storing SID -> ID: "
+ "%s\n", nt_errstr(status));
+ talloc_free(idstr);
+ return -1;
+ }
+
+ return 0;
+}
+
static int net_idmap_restore(struct net_context *c, int argc, const char **argv)
{
- TALLOC_CTX *ctx;
- FILE *input;
+ TALLOC_CTX *mem_ctx;
+ FILE *input = NULL;
+ struct db_context *db;
+ const char *dbfile = NULL;
+ int ret = 0;
+ struct net_idmap_ctx ctx = { .backend = TDB };
if (c->display_usage) {
- d_printf(_("Usage:\n"
- "net idmap restore [inputfile]\n"
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net idmap restore [--db=<TDB>] [<inputfile>]\n"
" Restore ID mappings from file\n"
- " inputfile\tFile to load ID mappings from. If "
- "not given, load data from stdin.\n"));
+ " TDB\tFile to store ID mappings to."
+ " inputfile\tFile to load ID mappings from. If not "
+ "given, load data from stdin.\n"));
return 0;
}
- if (! winbind_ping()) {
- d_fprintf(stderr,
- _("To use net idmap Winbindd must be running.\n"));
- return -1;
+ mem_ctx = talloc_stackframe();
+
+ dbfile = net_idmap_dbfile(c, &ctx);
+
+ if (dbfile == NULL) {
+ ret = -1;
+ goto done;
}
- ctx = talloc_new(NULL);
- ALLOC_CHECK(ctx);
+ if (ctx.backend != TDB) {
+ d_fprintf(stderr, _("Sorry, restoring of non-TDB databases is "
+ "currently not supported\n"));
+ ret = -1;
+ goto done;
+ }
+
+ d_fprintf(stderr, _("restoring id mapping to %s\n"), dbfile);
if (argc == 1) {
input = fopen(argv[0], "r");
+ if (input == NULL) {
+ d_fprintf(stderr, _("Could not open input file (%s): %s\n"),
+ argv[0], strerror(errno));
+ ret = -1;
+ goto done;
+ }
} else {
input = stdin;
}
+ db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644,
+ DBWRAP_LOCK_ORDER_1);
+ if (db == NULL) {
+ d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"),
+ dbfile, strerror(errno));
+ ret = -1;
+ goto done;
+ }
+
+ if (dbwrap_transaction_start(db) != 0) {
+ d_fprintf(stderr, _("Failed to start transaction.\n"));
+ ret = -1;
+ goto done;
+ }
+
while (!feof(input)) {
char line[128], sid_string[128];
int len;
- struct wbcDomainSid sid;
- enum id_type type = ID_TYPE_NOT_SPECIFIED;
unsigned long idval;
- wbcErr wbc_status;
+ NTSTATUS status;
if (fgets(line, 127, input) == NULL)
break;
if ( (len > 0) && (line[len-1] == '\n') )
line[len-1] = '\0';
- if (sscanf(line, "GID %lu %128s", &idval, sid_string) == 2) {
- type = ID_TYPE_GID;
- } else if (sscanf(line, "UID %lu %128s", &idval, sid_string) == 2) {
- type = ID_TYPE_UID;
+ if (sscanf(line, "GID %lu %128s", &idval, sid_string) == 2)
+ {
+ ret = net_idmap_store_id_mapping(db, ID_TYPE_GID,
+ idval, sid_string);
+ if (ret != 0) {
+ break;
+ }
+ } else if (sscanf(line, "UID %lu %128s", &idval, sid_string) == 2)
+ {
+ ret = net_idmap_store_id_mapping(db, ID_TYPE_UID,
+ idval, sid_string);
+ if (ret != 0) {
+ break;
+ }
} else if (sscanf(line, "USER HWM %lu", &idval) == 1) {
- /* set uid hwm */
- wbc_status = wbcSetUidHwm(idval);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
+ status = dbwrap_store_int32_bystring(
+ db, "USER HWM", idval);
+ if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr,
- _("Could not set USER HWM: %s\n"),
- wbcErrorString(wbc_status));
+ _("Could not store USER HWM: %s\n"),
+ nt_errstr(status));
+ break;
}
- continue;
} else if (sscanf(line, "GROUP HWM %lu", &idval) == 1) {
- /* set gid hwm */
- wbc_status = wbcSetGidHwm(idval);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
+ status = dbwrap_store_int32_bystring(
+ db, "GROUP HWM", idval);
+ if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr,
- _("Could not set GROUP HWM: %s\n"),
- wbcErrorString(wbc_status));
+ _("Could not store GROUP HWM: %s\n"),
+ nt_errstr(status));
+ break;
}
- continue;
} else {
d_fprintf(stderr, _("ignoring invalid line [%s]\n"),
line);
continue;
}
+ }
- wbc_status = wbcStringToSid(sid_string, &sid);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, _("ignoring invalid sid [%s]: %s\n"),
- sid_string, wbcErrorString(wbc_status));
- continue;
- }
-
- if (type == ID_TYPE_UID) {
- wbc_status = wbcSetUidMapping(idval, &sid);
- } else {
- wbc_status = wbcSetGidMapping(idval, &sid);
+ if (ret == 0) {
+ if(dbwrap_transaction_commit(db) != 0) {
+ d_fprintf(stderr, _("Failed to commit transaction.\n"));
+ ret = -1;
}
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr,
- _("Could not set mapping of %s %lu to sid %s: %s\n"),
- (type == ID_TYPE_GID) ? "GID" : "UID",
- idval, sid_string,
- wbcErrorString(wbc_status));
- continue;
+ } else {
+ if (dbwrap_transaction_cancel(db) != 0) {
+ d_fprintf(stderr, _("Failed to cancel transaction.\n"));
}
}
- if (input != stdin) {
+done:
+ if ((input != NULL) && (input != stdin)) {
fclose(input);
}
- talloc_free(ctx);
- return 0;
+ talloc_free(mem_ctx);
+ return ret;
+}
+
+static
+NTSTATUS dbwrap_delete_mapping(struct db_context *db, TDB_DATA key1, bool force)
+{
+ TALLOC_CTX *mem_ctx = talloc_stackframe();
+ bool is_valid_mapping;
+ NTSTATUS status = NT_STATUS_OK;
+ TDB_DATA val1, val2;
+
+ ZERO_STRUCT(val1);
+ ZERO_STRUCT(val2);
+
+ status = dbwrap_fetch(db, mem_ctx, key1, &val1);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("failed to fetch: %.*s\n", (int)key1.dsize, key1.dptr));
+ goto done;
+ }
+
+ if (val1.dptr == NULL) {
+ DEBUG(1, ("invalid mapping: %.*s -> empty value\n",
+ (int)key1.dsize, key1.dptr));
+ status = NT_STATUS_FILE_INVALID;
+ goto done;
+ }
+
+ DEBUG(2, ("mapping: %.*s -> %.*s\n",
+ (int)key1.dsize, key1.dptr, (int)val1.dsize, val1.dptr));
+
+ status = dbwrap_fetch(db, mem_ctx, val1, &val2);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("failed to fetch: %.*s\n", (int)val1.dsize, val1.dptr));
+ goto done;
+ }
+
+ is_valid_mapping = tdb_data_equal(key1, val2);
+
+ if (!is_valid_mapping) {
+ DEBUG(1, ("invalid mapping: %.*s -> %.*s -> %.*s\n",
+ (int)key1.dsize, key1.dptr,
+ (int)val1.dsize, val1.dptr,
+ (int)val2.dsize, val2.dptr));
+ if ( !force ) {
+ status = NT_STATUS_FILE_INVALID;
+ goto done;
+ }
+ }
+
+ status = dbwrap_delete(db, key1);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("failed to delete: %.*s\n", (int)key1.dsize, key1.dptr));
+ goto done;
+ }
+
+ if (!is_valid_mapping) {
+ goto done;
+ }
+
+ status = dbwrap_delete(db, val1);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("failed to delete: %.*s\n", (int)val1.dsize, val1.dptr));
+ }
+
+done:
+ talloc_free(mem_ctx);
+ return status;
+}
+
+static
+NTSTATUS delete_mapping_action(struct db_context *db, void* data)
+{
+ return dbwrap_delete_mapping(db, *(TDB_DATA*)data, false);
+}
+static
+NTSTATUS delete_mapping_action_force(struct db_context *db, void* data)
+{
+ return dbwrap_delete_mapping(db, *(TDB_DATA*)data, true);
}
/***********************************************************
Delete a SID mapping from a winbindd_idmap.tdb
**********************************************************/
+static bool delete_args_ok(int argc, const char **argv)
+{
+ if (argc != 1)
+ return false;
+ if (strncmp(argv[0], "S-", 2) == 0)
+ return true;
+ if (strncmp(argv[0], "GID ", 4) == 0)
+ return true;
+ if (strncmp(argv[0], "UID ", 4) == 0)
+ return true;
+ return false;
+}
+
+static int net_idmap_delete_mapping(struct net_context *c, int argc,
+ const char **argv)
+{
+ int ret = -1;
+ struct db_context *db;
+ TALLOC_CTX *mem_ctx;
+ TDB_DATA key;
+ NTSTATUS status;
+ const char* dbfile;
+ struct net_idmap_ctx ctx = { .backend = TDB };
+
+ if ( !delete_args_ok(argc,argv) || c->display_usage) {
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net idmap delete mapping [-f] [--db=<TDB>] <ID>\n"
+ " Delete mapping of ID from TDB.\n"
+ " -f\tforce\n"
+ " TDB\tidmap database\n"
+ " ID\tSID|GID|UID\n"));
+ return c->display_usage ? 0 : -1;
+ }
+
+ mem_ctx = talloc_stackframe();
+
+ dbfile = net_idmap_dbfile(c, &ctx);
+ if (dbfile == NULL) {
+ goto done;
+ }
+ d_fprintf(stderr, _("deleting id mapping from %s\n"), dbfile);
+
+ db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDWR, 0,
+ DBWRAP_LOCK_ORDER_1);
+ if (db == NULL) {
+ d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"),
+ dbfile, strerror(errno));
+ goto done;
+ }
+
+ key = string_term_tdb_data(argv[0]);
+
+ status = dbwrap_trans_do(db, (c->opt_force
+ ? delete_mapping_action_force
+ : delete_mapping_action), &key);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ d_fprintf(stderr, _("could not delete mapping: %s\n"),
+ nt_errstr(status));
+ goto done;
+ }
+ ret = 0;
+done:
+ talloc_free(mem_ctx);
+ return ret;
+}
+
static int net_idmap_delete(struct net_context *c, int argc, const char **argv)
{
- d_printf(_("Not Implemented yet\n"));
- return -1;
+ struct functable func[] = {
+ {
+ "mapping",
+ net_idmap_delete_mapping,
+ NET_TRANSPORT_LOCAL,
+ N_("Delete ID mapping"),
+ N_("net idmap delete mapping <ID>\n"
+ " Delete ID mapping")
+ },
+ {NULL, NULL, 0, NULL, NULL}
+ };
+
+ return net_run_function(c, argc, argv, "net idmap delete", func);
}
-static int net_idmap_set(struct net_context *c, int argc, const char **argv)
+
+static int net_idmap_set_mapping(struct net_context *c,
+ int argc, const char **argv)
{
- d_printf(_("Not Implemented yet\n"));
+ d_printf("%s\n", _("Not implemented yet"));
return -1;
}
-bool idmap_store_secret(const char *backend, bool alloc,
- const char *domain, const char *identity,
- const char *secret)
+
+static bool idmap_store_secret(const char *backend,
+ const char *domain,
+ const char *identity,
+ const char *secret)
{
char *tmp;
int r;
bool ret;
- if (alloc) {
- r = asprintf(&tmp, "IDMAP_ALLOC_%s", backend);
- } else {
- r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain);
- }
+ r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain);
if (r < 0) return false;
- strupper_m(tmp); /* make sure the key is case insensitive */
+ /* make sure the key is case insensitive */
+ if (!strupper_m(tmp)) {
+ free(tmp);
+ return false;
+ }
ret = secrets_store_generic(tmp, identity, secret);
free(tmp);
bool ret;
if (argc != 2 || c->display_usage) {
- d_printf(_("Usage:\n"
- "net idmap secret {<DOMAIN>|alloc} <secret>\n"
- " Set the secret for the specified domain "
- "(or alloc module)\n"
+ d_printf("%s\n%s",
+ _("Usage:\n"),
+ _("net idmap set secret <DOMAIN> <secret>\n"
+ " Set the secret for the specified domain\n"
" DOMAIN\tDomain to set secret for.\n"
- " alloc\tSet secret for the alloc module\n"
" secret\tNew secret to set.\n"));
return c->display_usage?0:-1;
}
ctx = talloc_new(NULL);
ALLOC_CHECK(ctx);
- if (strcmp(argv[0], "alloc") == 0) {
- domain = NULL;
- backend = lp_idmap_alloc_backend();
- } else {
- domain = talloc_strdup(ctx, argv[0]);
- ALLOC_CHECK(domain);
+ domain = talloc_strdup(ctx, argv[0]);
+ ALLOC_CHECK(domain);
- opt = talloc_asprintf(ctx, "idmap config %s", domain);
- ALLOC_CHECK(opt);
+ opt = talloc_asprintf(ctx, "idmap config %s", domain);
+ ALLOC_CHECK(opt);
- backend = talloc_strdup(ctx, lp_parm_const_string(-1, opt, "backend", "tdb"));
- ALLOC_CHECK(backend);
- }
+ backend = talloc_strdup(ctx, lp_parm_const_string(-1, opt, "backend", "tdb"));
+ ALLOC_CHECK(backend);
- if ( ( ! backend) || ( ! strequal(backend, "ldap"))) {
+ if ((!backend) || (!strequal(backend, "ldap") &&
+ !strequal(backend, "rfc2307"))) {
d_fprintf(stderr,
- _("The only currently supported backend is LDAP\n"));
+ _("The only currently supported backend are LDAP "
+ "and rfc2307\n"));
talloc_free(ctx);
return -1;
}
- if (domain) {
-
- dn = lp_parm_const_string(-1, opt, "ldap_user_dn", NULL);
- if ( ! dn) {
- d_fprintf(stderr,
- _("Missing ldap_user_dn option for domain "
- "%s\n"), domain);
- talloc_free(ctx);
- return -1;
- }
-
- ret = idmap_store_secret("ldap", false, domain, dn, secret);
- } else {
- dn = lp_parm_const_string(-1, "idmap alloc config", "ldap_user_dn", NULL);
- if ( ! dn) {
- d_fprintf(stderr,
- _("Missing ldap_user_dn option for alloc "
- "backend\n"));
- talloc_free(ctx);
- return -1;
- }
-
- ret = idmap_store_secret("ldap", true, NULL, dn, secret);
+ dn = lp_parm_const_string(-1, opt, "ldap_user_dn", NULL);
+ if ( ! dn) {
+ d_fprintf(stderr,
+ _("Missing ldap_user_dn option for domain %s\n"),
+ domain);
+ talloc_free(ctx);
+ return -1;
}
+ ret = idmap_store_secret("ldap", domain, dn, secret);
+
if ( ! ret) {
d_fprintf(stderr, _("Failed to store secret\n"));
talloc_free(ctx);
return 0;
}
-int net_help_idmap(struct net_context *c, int argc, const char **argv)
+static int net_idmap_autorid_set_config(struct net_context *c,
+ int argc, const char **argv)
{
- d_printf(_("net idmap dump <inputfile>\n"
- " Dump current id mapping\n"));
+ int ret = -1;
+ NTSTATUS status;
+ TALLOC_CTX *mem_ctx;
+ struct db_context *db = NULL;
+
+ if (argc != 1 || c->display_usage) {
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net idmap set config <config>"
+ " [--db=<inputfile>]\n"
+ " Update CONFIG entry in autorid.\n"
+ " config\tConfig string to be stored\n"
+ " inputfile\tTDB file to update config.\n"));
+ return c->display_usage ? 0 : -1;
+ }
- d_printf(_("net idmap restore\n"
- " Restore entries from stdin\n"));
+ mem_ctx = talloc_stackframe();
- /* Deliberately *not* document net idmap delete */
+ if (!net_idmap_opendb_autorid(mem_ctx, c, false, &db)) {
+ goto done;
+ }
- d_printf(_("net idmap secret <DOMAIN>|alloc <secret>\n"
- " Set the secret for the specified DOMAIN (or the alloc "
- "module)\n"));
+ status = idmap_autorid_saveconfigstr(db, argv[0]);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf("Error storing the config in the database: %s\n",
+ nt_errstr(status));
+ goto done;
+ }
- return -1;
+ ret = 0;
+
+done:
+ TALLOC_FREE(mem_ctx);
+ return ret;
}
-static int net_idmap_aclmapset(struct net_context *c, int argc, const char **argv)
+static int net_idmap_set(struct net_context *c, int argc, const char **argv)
{
- TALLOC_CTX *mem_ctx;
- int result = -1;
- DOM_SID src_sid, dst_sid;
- char *src, *dst;
- struct db_context *db;
- struct db_record *rec;
- NTSTATUS status;
-
- if (argc != 3 || c->display_usage) {
- d_fprintf(stderr, _("usage: net idmap aclmapset <tdb> "
- "<src-sid> <dst-sid>\n"));
- return -1;
- }
+ struct functable func[] = {
+ {
+ "mapping",
+ net_idmap_set_mapping,
+ NET_TRANSPORT_LOCAL,
+ N_("Not implemented yet"),
+ N_("net idmap set mapping\n"
+ " Not implemented yet")
+ },
+ {
+ "config",
+ net_idmap_autorid_set_config,
+ NET_TRANSPORT_LOCAL,
+ N_("Save the global configuration in the autorid database"),
+ N_("net idmap set config \n"
+ " Save the global configuration in the autorid database ")
+ },
+ {
+ "secret",
+ net_idmap_secret,
+ NET_TRANSPORT_LOCAL,
+ N_("Set secret for specified domain"),
+ N_("net idmap set secret <DOMAIN> <secret>\n"
+ " Set secret for specified domain")
+ },
+ {NULL, NULL, 0, NULL, NULL}
+ };
- if (!(mem_ctx = talloc_init("net idmap aclmapset"))) {
- d_fprintf(stderr, _("talloc_init failed\n"));
- return -1;
- }
+ return net_run_function(c, argc, argv, "net idmap set", func);
+}
- if (!(db = db_open(mem_ctx, argv[0], 0, TDB_DEFAULT,
- O_RDWR|O_CREAT, 0600))) {
- d_fprintf(stderr, _("db_open failed: %s\n"), strerror(errno));
- goto fail;
- }
+static int net_idmap_get(struct net_context *c, int argc, const char **argv)
+{
+ struct functable func[] = {
+ {NULL, NULL, 0, NULL, NULL}
+ };
- if (!string_to_sid(&src_sid, argv[1])) {
- d_fprintf(stderr, _("%s is not a valid sid\n"), argv[1]);
- goto fail;
- }
+ return net_run_function(c, argc, argv, "net idmap get", func);
+}
- if (!string_to_sid(&dst_sid, argv[2])) {
- d_fprintf(stderr, _("%s is not a valid sid\n"), argv[2]);
- goto fail;
+static int net_idmap_check(struct net_context *c, int argc, const char **argv)
+{
+ const char* dbfile;
+ struct check_options opts;
+ struct net_idmap_ctx ctx = { .backend = TDB };
+
+ if ( argc > 1 || c->display_usage) {
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net idmap check [-v] [-r] [-a] [-T] [-f] [-l] [[--db=]<TDB>]\n"
+ " Check an idmap database.\n"
+ " --verbose,-v\tverbose\n"
+ " --repair,-r\trepair\n"
+ " --auto,-a\tnoninteractive mode\n"
+ " --test,-T\tdry run\n"
+ " --fore,-f\tforce\n"
+ " --lock,-l\tlock db while doing the check\n"
+ " TDB\tidmap database\n"));
+ return c->display_usage ? 0 : -1;
}
- if (!(src = sid_string_talloc(mem_ctx, &src_sid))
- || !(dst = sid_string_talloc(mem_ctx, &dst_sid))) {
- d_fprintf(stderr, _("talloc_strdup failed\n"));
- goto fail;
+ dbfile = (argc > 0) ? argv[0] : net_idmap_dbfile(c, &ctx);
+ if (dbfile == NULL) {
+ return -1;
}
- if (!(rec = db->fetch_locked(
- db, mem_ctx, string_term_tdb_data(src)))) {
- d_fprintf(stderr, _("could not fetch db record\n"));
- goto fail;
+ if (ctx.backend != TDB) {
+ d_fprintf(stderr, _("Sorry, checking of non-TDB databases is "
+ "currently not supported\n"));
+ return -1;
}
- status = rec->store(rec, string_term_tdb_data(dst), 0);
- TALLOC_FREE(rec);
+ d_fprintf(stderr, _("check database: %s\n"), dbfile);
- if (!NT_STATUS_IS_OK(status)) {
- d_fprintf(stderr, _("could not store record: %s\n"),
- nt_errstr(status));
- goto fail;
- }
+ opts = (struct check_options) {
+ .lock = c->opt_lock || c->opt_long_list_entries,
+ .test = c->opt_testmode,
+ .automatic = c->opt_auto,
+ .verbose = c->opt_verbose,
+ .force = c->opt_force,
+ .repair = c->opt_repair || c->opt_reboot,
+ };
- result = 0;
-fail:
- TALLOC_FREE(mem_ctx);
- return result;
+ return net_idmap_check_db(dbfile, &opts);
}
/***********************************************************
"dump",
net_idmap_dump,
NET_TRANSPORT_LOCAL,
- N_("Dump the current ID mappings"),
+ N_("Dump the current ID mapping database"),
N_("net idmap dump\n"
" Dump the current ID mappings")
},
"restore",
net_idmap_restore,
NET_TRANSPORT_LOCAL,
- N_("Restore entries from stdin"),
+ N_("Restore entries from a file or stdin"),
N_("net idmap restore\n"
" Restore entries from stdin")
},
{
- "setmap",
+ "get",
+ net_idmap_get,
+ NET_TRANSPORT_LOCAL,
+ N_("Read data from the ID mapping database"),
+ N_("net idmap get\n"
+ " Read data from the ID mapping database")
+ },
+ {
+ "set",
net_idmap_set,
NET_TRANSPORT_LOCAL,
- N_("Not implemented yet"),
- N_("net idmap setmap\n"
- " Not implemented yet")
+ N_("Write data to the ID mapping database"),
+ N_("net idmap set\n"
+ " Write data to the ID mapping database")
},
{
"delete",
net_idmap_delete,
NET_TRANSPORT_LOCAL,
- N_("Not implemented yet"),
+ N_("Delete entries from the ID mapping database"),
N_("net idmap delete\n"
- " Not implemented yet")
+ " Delete entries from the ID mapping database")
},
{
"secret",
net_idmap_secret,
NET_TRANSPORT_LOCAL,
N_("Set secret for specified domain"),
- N_("net idmap secret {<DOMAIN>|alloc} <secret>\n"
- " Set secret for specified domain or alloc module")
+ N_("net idmap secret <DOMAIN> <secret>\n"
+ " Set secret for specified domain")
},
{
- "aclmapset",
- net_idmap_aclmapset,
+ "check",
+ net_idmap_check,
NET_TRANSPORT_LOCAL,
- N_("Set acl map"),
- N_("net idmap aclmapset\n"
- " Set acl map")
+ N_("Check id mappings"),
+ N_("net idmap check\n"
+ " Check id mappings")
},
{NULL, NULL, 0, NULL, NULL}
};