auth/credentials: don't ignore "client use kerberos" and --use-kerberos for machine...
[samba.git] / source3 / utils / net_idmap.c
index b12039bde990c1371ff295298bf8109161833205..027b74131ddab16bc7f18957d08c4cf3ae1c883b 100644 (file)
@@ -27,6 +27,8 @@
 #include "../libcli/security/security.h"
 #include "net_idmap_check.h"
 #include "util_tdb.h"
+#include "idmap_autorid_tdb.h"
+#include "lib/util/smb_strtox.h"
 
 #define ALLOC_CHECK(mem) do { \
        if (!mem) { \
@@ -128,10 +130,11 @@ static int net_idmap_dump_one_tdb_entry(struct db_record *rec,
        return 0;
 }
 
-static const char* net_idmap_dbfile(struct net_context *c,
-                                   struct net_idmap_ctx *ctx)
+/* returns db path for idmap backend alloced on talloc_tos */
+static char *net_idmap_dbfile(struct net_context *c,
+                             struct net_idmap_ctx *ctx)
 {
-       const char* dbfile = NULL;
+       char *dbfile = NULL;
        const char *backend = NULL;
 
        backend = lp_idmap_default_backend();
@@ -146,7 +149,7 @@ static const char* net_idmap_dbfile(struct net_context *c,
                        d_fprintf(stderr, _("Out of memory!\n"));
                }
        } else if (strequal(backend, "tdb")) {
-               dbfile = state_path("winbindd_idmap.tdb");
+               dbfile = state_path(talloc_tos(), "winbindd_idmap.tdb");
                if (dbfile == NULL) {
                        d_fprintf(stderr, _("Out of memory!\n"));
                }
@@ -159,7 +162,7 @@ static const char* net_idmap_dbfile(struct net_context *c,
                }
                ctx->backend = TDB;
        } else if (strequal(backend, "autorid")) {
-               dbfile = state_path("autorid.tdb");
+               dbfile = state_path(talloc_tos(), "autorid.tdb");
                if (dbfile == NULL) {
                        d_fprintf(stderr, _("Out of memory!\n"));
                }
@@ -180,6 +183,57 @@ static const char* net_idmap_dbfile(struct net_context *c,
        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;
+       char *dbfile = NULL;
+       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, DBWRAP_FLAG_NONE);
+               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:
+       talloc_free(dbfile);
+       return ret;
+}
+
+
 /***********************************************************
  Dump the current idmap
  **********************************************************/
@@ -210,7 +264,7 @@ static int net_idmap_dump(struct net_context *c, int argc, const char **argv)
        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);
+                    DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
        if (db == NULL) {
                d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"),
                          dbfile, strerror(errno));
@@ -336,7 +390,7 @@ static int net_idmap_restore(struct net_context *c, int argc, const char **argv)
        }
 
        db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644,
-                    DBWRAP_LOCK_ORDER_1);
+                    DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
        if (db == NULL) {
                d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"),
                          dbfile, strerror(errno));
@@ -364,14 +418,14 @@ static int net_idmap_restore(struct net_context *c, int argc, const char **argv)
                if ( (len > 0) && (line[len-1] == '\n') )
                        line[len-1] = '\0';
 
-               if (sscanf(line, "GID %lu %128s", &idval, sid_string) == 2)
+               if (sscanf(line, "GID %lu %127s", &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)
+               } else if (sscanf(line, "UID %lu %127s", &idval, sid_string) == 2)
                {
                        ret = net_idmap_store_id_mapping(db, ID_TYPE_UID,
                                                         idval, sid_string);
@@ -547,7 +601,7 @@ static int net_idmap_delete_mapping(struct net_context *c, int argc,
        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);
+                    DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
        if (db == NULL) {
                d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"),
                          dbfile, strerror(errno));
@@ -571,6 +625,166 @@ done:
        return ret;
 }
 
+static bool parse_uint32(const char *str, uint32_t *result)
+{
+       unsigned long val;
+       int error = 0;
+
+       val = smb_strtoul(str, NULL, 10, &error, SMB_STR_FULL_STR_CONV);
+       if (error != 0) {
+               return false;
+       }
+
+       *result = val;          /* Potential crop */
+       return true;
+}
+
+static void net_idmap_autorid_delete_range_usage(void)
+{
+       d_printf("%s\n%s",
+                _("Usage:"),
+                _("net idmap delete range [-f] [--db=<TDB>] <RANGE>|(<SID>[ <INDEX>])\n"
+                  "  Delete a domain range mapping from the database.\n"
+                  "    -f\tforce\n"
+                  "    TDB\tidmap database\n"
+                  "    RANGE\tthe range number to delete\n"
+                  "    SID\t\tSID of the domain\n"
+                  "    INDEX\trange index number do delete for the domain\n"));
+}
+
+static int net_idmap_autorid_delete_range(struct net_context *c, int argc,
+                                         const char **argv)
+{
+       int ret = -1;
+       struct db_context *db = NULL;
+       NTSTATUS status;
+       uint32_t rangenum;
+       uint32_t range_index;
+       const char *domsid;
+       TALLOC_CTX *mem_ctx = NULL;
+       bool ok;
+       bool force = (c->opt_force != 0);
+
+       if (c->display_usage) {
+               net_idmap_autorid_delete_range_usage();
+               return 0;
+       }
+
+       if (argc < 1 || argc > 2) {
+               net_idmap_autorid_delete_range_usage();
+               return -1;
+       }
+
+       mem_ctx = talloc_stackframe();
+       if (!net_idmap_opendb_autorid(mem_ctx, c, false, &db)) {
+               goto done;
+       }
+
+       ok = parse_uint32(argv[0], &rangenum);
+       if (ok) {
+               d_printf("%s: %"PRIu32"\n", _("Deleting range number"),
+                        rangenum);
+
+               status = idmap_autorid_delete_range_by_num(db, rangenum,
+                                                          force);
+               if (!NT_STATUS_IS_OK(status)) {
+                       d_fprintf(stderr, "%s: %s\n",
+                                 _("Failed to delete domain range mapping"),
+                                 nt_errstr(status));
+               } else {
+                       ret = 0;
+               }
+
+               goto done;
+       }
+
+       domsid = argv[0];
+       range_index = 0;
+
+       if (argc == 2) {
+               ok = parse_uint32(argv[1], &range_index);
+               if (!ok) {
+                       d_printf("%s: %s\n",
+                                _("Invalid index specification"), argv[1]);
+                       net_idmap_autorid_delete_range_usage();
+                       goto done;
+               }
+       }
+
+       status = idmap_autorid_delete_range_by_sid(db, domsid, range_index,
+                                                  force);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "%s: %s\n",
+                         _("Failed to delete domain range mapping"),
+                         nt_errstr(status));
+               goto done;
+       }
+
+       ret = 0;
+
+done:
+       talloc_free(mem_ctx);
+       return ret;
+}
+
+static void net_idmap_autorid_delete_ranges_usage(void)
+{
+       d_printf("%s\n%s",
+                _("Usage:"),
+                _("net idmap delete ranges [-f] [--db=<TDB>] <SID>\n"
+                  "  Delete all domain range mappings for a given domain.\n"
+                  "    -f\tforce\n"
+                  "    TDB\tidmap database\n"
+                  "    SID\t\tSID of the domain\n"));
+}
+
+static int net_idmap_autorid_delete_ranges(struct net_context *c, int argc,
+                                          const char **argv)
+{
+       int ret = -1;
+       struct db_context *db = NULL;
+       NTSTATUS status;
+       const char *domsid;
+       TALLOC_CTX *mem_ctx = NULL;
+       bool force = (c->opt_force != 0);
+       int count = 0;
+
+       if (c->display_usage) {
+               net_idmap_autorid_delete_ranges_usage();
+               return 0;
+       }
+
+       if (argc != 1) {
+               net_idmap_autorid_delete_ranges_usage();
+               return -1;
+       }
+
+       domsid = argv[0];
+
+       mem_ctx = talloc_stackframe();
+       if (!net_idmap_opendb_autorid(mem_ctx, c, false, &db)) {
+               goto done;
+       }
+
+       status = idmap_autorid_delete_domain_ranges(db, domsid, force, &count);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "%s %s: %s\n",
+                         _("Failed to delete domain range mappings for "
+                           "domain"),
+                         domsid,
+                         nt_errstr(status));
+               goto done;
+       }
+
+       d_printf(_("deleted %d domain mappings\n"), count);
+
+       ret = 0;
+
+done:
+       talloc_free(mem_ctx);
+       return ret;
+}
+
 static int net_idmap_delete(struct net_context *c, int argc, const char **argv)
 {
        struct functable func[] = {
@@ -582,6 +796,23 @@ static int net_idmap_delete(struct net_context *c, int argc, const char **argv)
                        N_("net idmap delete mapping <ID>\n"
                           "  Delete ID mapping")
                },
+               {
+                       "range",
+                       net_idmap_autorid_delete_range,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Delete a domain range mapping"),
+                       N_("net idmap delete range <RANGE>|(<SID>[ <INDEX>])\n"
+                          "  Delete a domain range mapping")
+               },
+               {
+                       "ranges",
+                       net_idmap_autorid_delete_ranges,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Delete all domain range mappings for a given "
+                          "domain"),
+                       N_("net idmap delete ranges <SID>\n"
+                          "  Delete a domain range mapping")
+               },
                {NULL, NULL, 0, NULL, NULL}
        };
 
@@ -596,6 +827,81 @@ static int net_idmap_set_mapping(struct net_context *c,
        return -1;
 }
 
+static void net_idmap_autorid_set_range_usage(void)
+{
+       d_printf("%s\n%s",
+                _("Usage:"),
+                _("net idmap set range"
+                  " <range> <SID> [<index>] [--db=<inputfile>]\n"
+                  "  Store a domain-range mapping for a given domain.\n"
+                  "    range\tRange number to be set for the domain\n"
+                  "    SID\t\tSID of the domain\n"
+                  "    index\trange-index number to be set for the domain\n"
+                  "    inputfile\tTDB file to add mapping to.\n"));
+}
+
+static int net_idmap_autorid_set_range(struct net_context *c,
+                                      int argc, const char **argv)
+{
+       int ret = -1;
+       TALLOC_CTX *mem_ctx;
+       struct db_context *db = NULL;
+       const char *domsid;
+       uint32_t rangenum;
+       uint32_t range_index = 0;
+       NTSTATUS status;
+       bool ok;
+
+       if (c->display_usage) {
+               net_idmap_autorid_set_range_usage();
+               return 0;
+       }
+
+       if (argc < 2  || argc > 3) {
+               net_idmap_autorid_set_range_usage();
+               return -1;
+       }
+
+       ok = parse_uint32(argv[0], &rangenum);
+       if (!ok) {
+               d_printf("%s: %s\n", _("Invalid range specification"),
+                        argv[0]);
+               net_idmap_autorid_set_range_usage();
+               return -1;
+       }
+
+       domsid = argv[1];
+
+       if (argc == 3) {
+               ok = parse_uint32(argv[2], &range_index);
+               if (!ok) {
+                       d_printf("%s: %s\n",
+                                _("Invalid index specification"), argv[2]);
+                       net_idmap_autorid_set_range_usage();
+                       return -1;
+               }
+       }
+
+       mem_ctx = talloc_stackframe();
+       if (!net_idmap_opendb_autorid(mem_ctx, c, false, &db)) {
+               goto done;
+       }
+
+       status = idmap_autorid_setrange(db, domsid, range_index, rangenum);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "%s: %s\n",
+                         _("Failed to save domain mapping"),
+                         nt_errstr(status));
+               goto done;
+       }
+
+       ret = 0;
+
+done:
+       TALLOC_FREE(mem_ctx);
+       return ret;
+}
+
 static bool idmap_store_secret(const char *backend,
                               const char *domain,
                               const char *identity,
@@ -685,6 +991,45 @@ static int net_idmap_secret(struct net_context *c, int argc, const char **argv)
        return 0;
 }
 
+static int net_idmap_autorid_set_config(struct net_context *c,
+                                       int argc, const char **argv)
+{
+       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;
+       }
+
+       mem_ctx = talloc_stackframe();
+
+       if (!net_idmap_opendb_autorid(mem_ctx, c, false, &db)) {
+               goto done;
+       }
+
+       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;
+       }
+
+       ret = 0;
+
+done:
+       TALLOC_FREE(mem_ctx);
+       return ret;
+}
+
 static int net_idmap_set(struct net_context *c, int argc, const char **argv)
 {
        struct functable func[] = {
@@ -696,6 +1041,22 @@ static int net_idmap_set(struct net_context *c, int argc, const char **argv)
                        N_("net idmap set mapping\n"
                           "  Not implemented yet")
                },
+               {
+                       "range",
+                       net_idmap_autorid_set_range,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Store a domain-range mapping"),
+                       N_("net idmap set range\n"
+                          "  Store a domain-range mapping")
+               },
+               {
+                       "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,
@@ -710,11 +1071,237 @@ static int net_idmap_set(struct net_context *c, int argc, const char **argv)
        return net_run_function(c, argc, argv, "net idmap set", func);
 }
 
+static void net_idmap_autorid_get_range_usage(void)
+{
+       d_printf("%s\n%s",
+                _("Usage:"),
+                _("net idmap get range <SID> [<index>] [--db=<inputfile>]\n"
+                  "  Get the range for a given domain and index.\n"
+                  "    SID\t\tSID of the domain\n"
+                  "    index\trange-index number to be retrieved\n"
+                  "    inputfile\tTDB file to add mapping to.\n"));
+}
+
+
+static int net_idmap_autorid_get_range(struct net_context *c, int argc,
+                                      const char **argv)
+{
+       int ret = -1;
+       TALLOC_CTX *mem_ctx;
+       struct db_context *db = NULL;
+       const char *domsid;
+       uint32_t rangenum;
+       uint32_t range_index = 0;
+       uint32_t low_id;
+       NTSTATUS status;
+       char *keystr;
+       bool ok;
+
+       if (c->display_usage) {
+               net_idmap_autorid_get_range_usage();
+               return 0;
+       }
+
+       if (argc < 1  || argc > 2) {
+               net_idmap_autorid_get_range_usage();
+               return -1;
+       }
+
+       domsid = argv[0];
+
+       if (argc == 2) {
+               ok = parse_uint32(argv[1], &range_index);
+               if (!ok) {
+                       d_printf("%s: %s\n",
+                                _("Invalid index specification"), argv[1]);
+                       net_idmap_autorid_get_range_usage();
+                       return -1;
+               }
+       }
+
+       mem_ctx = talloc_stackframe();
+       if (!net_idmap_opendb_autorid(mem_ctx, c, true, &db)) {
+               goto done;
+       }
+
+       status = idmap_autorid_getrange(db, domsid, range_index, &rangenum,
+                                       &low_id);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "%s: %s\n",
+                         _("Failed to load domain range"), nt_errstr(status));
+               goto done;
+       }
+
+       if (range_index == 0) {
+               keystr = talloc_strdup(mem_ctx, domsid);
+       } else {
+               keystr = talloc_asprintf(mem_ctx, "%s#%"PRIu32, domsid,
+                                        range_index);
+       }
+
+       printf("RANGE %"PRIu32": %s (low id: %"PRIu32")\n",
+              rangenum, keystr, low_id);
+
+       ret = 0;
+
+done:
+       TALLOC_FREE(mem_ctx);
+       return ret;
+}
+
+static NTSTATUS net_idmap_autorid_print_range(struct db_context *db,
+                                             const char *domsid,
+                                             uint32_t range_index,
+                                             uint32_t rangenum,
+                                             void *private_data)
+{
+       if (range_index == 0) {
+               printf("RANGE %"PRIu32": %s\n", rangenum, domsid);
+       } else {
+               printf("RANGE %"PRIu32": %s#%"PRIu32"\n", rangenum, domsid,
+                      range_index);
+       }
+
+       return NT_STATUS_OK;
+}
+
+static void net_idmap_autorid_get_ranges_usage(void)
+{
+       d_printf("%s\n%s",
+                _("Usage:"),
+                _("net idmap get ranges [<SID>] [--db=<inputfile>]\n"
+                  "  Get all ranges for a given domain.\n"
+                  "    SID\t\tSID of the domain - list all ranges if omitted\n"
+                  "    inputfile\tTDB file to add mapping to.\n"));
+}
+
+static int net_idmap_autorid_get_ranges(struct net_context *c, int argc,
+                                       const char **argv)
+{
+       int ret = -1;
+       TALLOC_CTX *mem_ctx;
+       struct db_context *db = NULL;
+       const char *domsid;
+       NTSTATUS status;
+
+       if (c->display_usage) {
+               net_idmap_autorid_get_ranges_usage();
+               return 0;
+       }
+
+       if (argc == 0) {
+               domsid = NULL;
+       } else if (argc == 1) {
+               domsid = argv[0];
+       } else {
+               net_idmap_autorid_get_ranges_usage();
+               return -1;
+       }
+
+       mem_ctx = talloc_stackframe();
+       if (!net_idmap_opendb_autorid(mem_ctx, c, true, &db)) {
+               goto done;
+       }
+
+       status = idmap_autorid_iterate_domain_ranges_read(db,
+                                               domsid,
+                                               net_idmap_autorid_print_range,
+                                               NULL, /* private_data */
+                                               NULL  /* count */);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "%s: %s\n",
+                         _("Error getting domain ranges"), nt_errstr(status));
+               goto done;
+       }
+
+       ret = 0;
+
+done:
+       talloc_free(mem_ctx);
+       return ret;
+}
+
+static int net_idmap_autorid_get_config(struct net_context *c, int argc,
+                                       const char **argv)
+{
+       int ret = -1;
+       char *config;
+       TALLOC_CTX *mem_ctx;
+       NTSTATUS status;
+       struct db_context *db = NULL;
+
+       if (argc > 0 || c->display_usage) {
+               d_printf("%s\n%s",
+                        _("Usage:"),
+                        _("net idmap get config"
+                          " [--db=<inputfile>]\n"
+                          " Get CONFIG entry from autorid database\n"
+                          "    inputfile\tTDB file to read config from.\n"));
+               return c->display_usage ? 0 : -1;
+       }
+
+       mem_ctx = talloc_stackframe();
+
+       if (!net_idmap_opendb_autorid(mem_ctx, c, true, &db)) {
+               goto done;
+       }
+
+       status = idmap_autorid_getconfigstr(db, mem_ctx, &config);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "%s: %s\n",
+                         _("Error: unable to read config entry"),
+                         nt_errstr(status));
+               goto done;
+       }
+
+       printf("CONFIG: %s\n", config);
+       ret = 0;
+
+done:
+       TALLOC_FREE(mem_ctx);
+       return ret;
+}
+
+
+static int net_idmap_get(struct net_context *c, int argc, const char **argv)
+{
+       struct functable func[] = {
+               {
+                       "range",
+                       net_idmap_autorid_get_range,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Get the range for a domain and range-index"),
+                       N_("net idmap get range\n"
+                          "  Get the range for a domain and range-index")
+               },
+               {
+                       "ranges",
+                       net_idmap_autorid_get_ranges,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Get all ranges for a domain"),
+                       N_("net idmap get ranges <SID>\n"
+                          "  Get all ranges for a domain")
+               },
+               {
+                       "config",
+                       net_idmap_autorid_get_config,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Get the global configuration from the autorid database"),
+                       N_("net idmap get config \n"
+                          "  Get the global configuration from the autorid database ")
+               },
+               {NULL, NULL, 0, NULL, NULL}
+       };
+
+       return net_run_function(c, argc, argv, "net idmap get", func);
+}
+
 static int net_idmap_check(struct net_context *c, int argc, const char **argv)
 {
-       const char* dbfile;
+       char *dbfile;
        struct check_options opts;
        struct net_idmap_ctx ctx = { .backend = TDB };
+       int ret;
 
        if ( argc > 1 || c->display_usage) {
                d_printf("%s\n%s",
@@ -725,13 +1312,17 @@ static int net_idmap_check(struct net_context *c, int argc, const char **argv)
                           "    --repair,-r\trepair\n"
                           "    --auto,-a\tnoninteractive mode\n"
                           "    --test,-T\tdry run\n"
-                          "    --fore,-f\tforce\n"
+                          "    --force,-f\tforce\n"
                           "    --lock,-l\tlock db while doing the check\n"
                           "    TDB\tidmap database\n"));
                return c->display_usage ? 0 : -1;
        }
 
-       dbfile = (argc > 0) ? argv[0] : net_idmap_dbfile(c, &ctx);
+       if (argc > 0) {
+               dbfile = talloc_strdup(talloc_tos(), argv[0]);
+       } else {
+               dbfile = net_idmap_dbfile(c, &ctx);
+       }
        if (dbfile == NULL) {
                return -1;
        }
@@ -739,6 +1330,7 @@ static int net_idmap_check(struct net_context *c, int argc, const char **argv)
        if (ctx.backend != TDB) {
                d_fprintf(stderr, _("Sorry, checking of non-TDB databases is "
                                    "currently not supported\n"));
+               talloc_free(dbfile);
                return -1;
        }
 
@@ -753,7 +1345,9 @@ static int net_idmap_check(struct net_context *c, int argc, const char **argv)
                .repair = c->opt_repair || c->opt_reboot,
        };
 
-       return net_idmap_check_db(dbfile, &opts);
+       ret = net_idmap_check_db(dbfile, &opts);
+       talloc_free(dbfile);
+       return ret;
 }
 
 /***********************************************************
@@ -778,6 +1372,14 @@ int net_idmap(struct net_context *c, int argc, const char **argv)
                        N_("net idmap restore\n"
                           "  Restore entries from stdin")
                },
+               {
+                       "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,
@@ -794,14 +1396,6 @@ int net_idmap(struct net_context *c, int argc, const char **argv)
                        N_("net idmap delete\n"
                           "  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> <secret>\n"
-                          "  Set secret for specified domain")
-               },
                {
                        "check",
                        net_idmap_check,