auth/credentials: don't ignore "client use kerberos" and --use-kerberos for machine...
[samba.git] / source3 / utils / net_idmap.c
index 7abb31ab3d98fdd20cd6a72f067539bb37b7a3fe..027b74131ddab16bc7f18957d08c4cf3ae1c883b 100644 (file)
-/* 
-   Samba Unix/Linux SMB client library 
-   Distributed SMB/CIFS Server Management Utility 
+/*
+   Samba Unix/Linux SMB client library
+   Distributed SMB/CIFS Server Management Utility
    Copyright (C) 2003 Andrew Bartlett (abartlet@samba.org)
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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"
+#include "lib/util/smb_strtox.h"
+
+#define ALLOC_CHECK(mem) do { \
+       if (!mem) { \
+               d_fprintf(stderr, _("Out of memory!\n")); \
+               talloc_free(ctx); \
+               return -1; \
+       } } while(0)
+
+enum idmap_dump_backend {
+       TDB,
+       AUTORID
+};
 
+struct net_idmap_ctx {
+       enum idmap_dump_backend backend;
+};
 
-/***********************************************************
- 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_autorid_entry(struct db_record *rec,
+                                           void *unused)
 {
-       if (strcmp(key.dptr, "USER HWM") == 0) {
-               printf("USER HWM %d\n", IVAL(data.dptr,0));
+       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 (strcmp(key.dptr, "GROUP HWM") == 0) {
-               printf("GROUP HWM %d\n", IVAL(data.dptr,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(key.dptr, "S-", 2) != 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;
+       }
 
-       printf("%s %s\n", data.dptr, key.dptr);
        return 0;
 }
 
 /***********************************************************
- Dump the current idmap
+ Helper function for net_idmap_dump. Dump one entry.
  **********************************************************/
-static int net_idmap_dump(int argc, const char **argv)
+static int net_idmap_dump_one_tdb_entry(struct db_record *rec,
+                                       void *unused)
 {
-       TDB_CONTEXT *idmap_tdb;
-
-       if ( argc != 1 )
-               return net_help_idmap( argc, argv );
+       TDB_DATA key;
+       TDB_DATA value;
 
-       idmap_tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0);
+       key = dbwrap_record_get_key(rec);
+       value = dbwrap_record_get_value(rec);
 
-       if (idmap_tdb == NULL) {
-               d_printf("Could not open idmap: %s\n", argv[0]);
-               return -1;
+       if (strcmp((char *)key.dptr, "USER HWM") == 0) {
+               printf(_("USER HWM %d\n"), IVAL(value.dptr,0));
+               return 0;
        }
 
-       tdb_traverse(idmap_tdb, net_idmap_dump_one_entry, NULL);
+       if (strcmp((char *)key.dptr, "GROUP HWM") == 0) {
+               printf(_("GROUP HWM %d\n"), IVAL(value.dptr,0));
+               return 0;
+       }
 
-       tdb_close(idmap_tdb);
+       if (strncmp((char *)key.dptr, "S-", 2) != 0) {
+               return 0;
+       }
 
+       printf("%s %s\n", value.dptr, key.dptr);
        return 0;
 }
 
-/***********************************************************
- Fix up the HWMs after a idmap restore.
- **********************************************************/
-
-struct hwms {
-       BOOL ok;
-       int user_hwm;
-       int group_hwm;
-};
-
-static int net_idmap_find_max_id(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data,
-                                void *handle)
+/* returns db path for idmap backend alloced on talloc_tos */
+static char *net_idmap_dbfile(struct net_context *c,
+                             struct net_idmap_ctx *ctx)
 {
-       struct hwms *hwms = (struct hwms *)handle;
-       int *idptr = NULL;
-       int id;
-
-       if (strncmp(key.dptr, "S-", 2) != 0)
-               return 0;
+       char *dbfile = NULL;
+       const char *backend = NULL;
 
-       if (sscanf(data.dptr, "GID %d", &id) == 1) {
-               idptr = &hwms->group_hwm;
+       backend = lp_idmap_default_backend();
+       if (!backend) {
+               d_printf(_("Internal error: 'idmap config * : backend' is not set!\n"));
+               return NULL;
        }
 
-       if (sscanf(data.dptr, "UID %d", &id) == 1) {
-               idptr = &hwms->user_hwm;
-       }
+       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(talloc_tos(), "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(talloc_tos(), "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';
+               }
 
-       if (idptr == NULL) {
-               d_printf("Illegal idmap entry: [%s]->[%s]\n",
-                        key.dptr, data.dptr);
-               hwms->ok = False;
-               return -1;
-       }
+               d_printf(_("Sorry, 'idmap backend = %s' is currently not supported\n"),
+                          _backend);
 
-       if (*idptr <= id)
-               *idptr = id+1;
+               talloc_free(_backend);
+       }
 
-       return 0;
+       return dbfile;
 }
 
-static NTSTATUS net_idmap_fixup_hwm(void)
+static bool net_idmap_opendb_autorid(TALLOC_CTX *mem_ctx,
+                                    struct net_context *c,
+                                    bool readonly,
+                                    struct db_context **db)
 {
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       TDB_CONTEXT *idmap_tdb;
-       char *tdbfile = NULL;
+       bool ret = false;
+       char *dbfile = NULL;
+       struct net_idmap_ctx ctx = { .backend = AUTORID };
 
-       struct hwms hwms;
-       struct hwms highest;
-
-       if (!lp_idmap_uid(&hwms.user_hwm, &highest.user_hwm) ||
-           !lp_idmap_gid(&hwms.group_hwm, &highest.group_hwm)) {
-               d_printf("idmap range missing\n");
-               return NT_STATUS_UNSUCCESSFUL;
+       if (c == NULL) {
+               goto done;
        }
 
-       tdbfile = SMB_STRDUP(lock_path("winbindd_idmap.tdb"));
-       if (!tdbfile) {
-               DEBUG(0, ("idmap_init: out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
+       dbfile = net_idmap_dbfile(c, &ctx);
+       if (dbfile == NULL) {
+               goto done;
        }
 
-       idmap_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR, 0);
+       if (ctx.backend != AUTORID) {
+               d_fprintf(stderr, _("Unsupported backend\n"));
+               goto done;
+       }
 
-       if (idmap_tdb == NULL) {
-               d_printf("Could not open idmap: %s\n", tdbfile);
-               return NT_STATUS_NO_SUCH_FILE;
+       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;
+               }
        }
 
-       hwms.ok = True;
+       ret = true;
 
-       tdb_traverse(idmap_tdb, net_idmap_find_max_id, &hwms);
+done:
+       talloc_free(dbfile);
+       return ret;
+}
 
-       if (!hwms.ok) {
-               goto done;
+
+/***********************************************************
+ Dump the current idmap
+ **********************************************************/
+static int net_idmap_dump(struct net_context *c, int argc, const char **argv)
+{
+       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("%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;
        }
 
-       d_printf("USER HWM: %d  GROUP HWM: %d\n",
-                hwms.user_hwm, hwms.group_hwm);
+       mem_ctx = talloc_stackframe();
 
-       if (hwms.user_hwm >= highest.user_hwm) {
-               d_printf("Highest UID out of uid range\n");
+       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);
 
-       if (hwms.group_hwm >= highest.group_hwm) {
-               d_printf("Highest GID out of gid range\n");
+       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 idmap db (%s): %s\n"),
+                         dbfile, strerror(errno));
                goto done;
        }
 
-       if ((tdb_store_int32(idmap_tdb, "USER HWM", hwms.user_hwm) != 0) ||
-           (tdb_store_int32(idmap_tdb, "GROUP HWM", hwms.group_hwm) != 0)) {
-               d_printf("Could not store HWMs\n");
+       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;
        }
 
-       result = NT_STATUS_OK;
- done:
-       tdb_close(idmap_tdb);
-       return result;
+       ret = 0;
+
+done:
+       talloc_free(mem_ctx);
+       return ret;
 }
 
 /***********************************************************
  Write entries from stdin to current local idmap
  **********************************************************/
-static int net_idmap_restore(int argc, const char **argv)
+
+static int net_idmap_store_id_mapping(struct db_context *db,
+                                     enum id_type type,
+                                     unsigned long idval,
+                                     const char *sid_string)
 {
-       if (!idmap_init(lp_idmap_backend())) {
-               d_printf("Could not init idmap\n");
+       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;
        }
 
-       while (!feof(stdin)) {
-               fstring line, sid_string;
+       return 0;
+}
+
+static int net_idmap_restore(struct net_context *c, int argc, const char **argv)
+{
+       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("%s\n%s",
+                        _("Usage:"),
+                        _("net idmap restore [--db=<TDB>] [<inputfile>]\n"
+                          "  Restore ID mappings from file\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;
+       }
+
+       mem_ctx = talloc_stackframe();
+
+       dbfile = net_idmap_dbfile(c, &ctx);
+
+       if (dbfile == NULL) {
+               ret = -1;
+               goto done;
+       }
+
+       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, DBWRAP_FLAG_NONE);
+       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;
-               unid_t id;
-               int type = ID_EMPTY;
-               DOM_SID sid;
+               unsigned long idval;
+               NTSTATUS status;
 
-               if (fgets(line, sizeof(line)-1, stdin) == NULL)
+               if (fgets(line, 127, input) == NULL)
                        break;
 
                len = strlen(line);
@@ -197,122 +418,996 @@ static int net_idmap_restore(int argc, const char **argv)
                if ( (len > 0) && (line[len-1] == '\n') )
                        line[len-1] = '\0';
 
-               /* Yuck - this is broken for sizeof(gid_t) != sizeof(int) */
+               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 %127s", &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) {
+                       status = dbwrap_store_int32_bystring(
+                               db, "USER HWM", idval);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               d_fprintf(stderr,
+                                         _("Could not store USER HWM: %s\n"),
+                                         nt_errstr(status));
+                               break;
+                       }
+               } else if (sscanf(line, "GROUP HWM %lu", &idval) == 1) {
+                       status = dbwrap_store_int32_bystring(
+                               db, "GROUP HWM", idval);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               d_fprintf(stderr,
+                                         _("Could not store GROUP HWM: %s\n"),
+                                         nt_errstr(status));
+                               break;
+                       }
+               } else {
+                       d_fprintf(stderr, _("ignoring invalid line [%s]\n"),
+                                 line);
+                       continue;
+               }
+       }
 
-               if (sscanf(line, "GID %d %s", &id.gid, sid_string) == 2) {
-                       type = ID_GROUPID;
+       if (ret == 0) {
+               if(dbwrap_transaction_commit(db) != 0) {
+                       d_fprintf(stderr, _("Failed to commit transaction.\n"));
+                       ret = -1;
+               }
+       } else {
+               if (dbwrap_transaction_cancel(db) != 0) {
+                       d_fprintf(stderr, _("Failed to cancel transaction.\n"));
                }
+       }
 
-               /* Yuck - this is broken for sizeof(uid_t) != sizeof(int) */
+done:
+       if ((input != NULL) && (input != stdin)) {
+               fclose(input);
+       }
 
-               if (sscanf(line, "UID %d %s", &id.uid, sid_string) == 2) {
-                       type = ID_USERID;
-               }
+       talloc_free(mem_ctx);
+       return ret;
+}
 
-               if (type == ID_EMPTY) {
-                       d_printf("ignoring invalid line [%s]\n", line);
-                       continue;
-               }
+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;
 
-               if (!string_to_sid(&sid, sid_string)) {
-                       d_printf("ignoring invalid sid [%s]\n", sid_string);
-                       continue;
-               }
+       ZERO_STRUCT(val1);
+       ZERO_STRUCT(val2);
 
-               if (!NT_STATUS_IS_OK(idmap_set_mapping(&sid, id, type))) {
-                       d_printf("Could not set mapping of %s %lu to sid %s\n",
-                                (type == ID_GROUPID) ? "GID" : "UID",
-                                (type == ID_GROUPID) ? (unsigned long)id.gid:
-                                (unsigned long)id.uid, 
-                                sid_string_static(&sid));
-                       continue;
+       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;
                }
-                                
        }
 
-       idmap_close();
+       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;
+       }
 
-       return NT_STATUS_IS_OK(net_idmap_fixup_hwm()) ? 0 : -1;
+       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 int net_idmap_delete(int argc, const char **argv)
+static bool delete_args_ok(int argc, const char **argv)
 {
-       TDB_CONTEXT *idmap_tdb;
-       TDB_DATA key, data;
-       fstring sid;
+       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, DBWRAP_FLAG_NONE);
+       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 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;
 
-       if (argc != 2)
-               return net_help_idmap(argc, argv);
+done:
+       talloc_free(mem_ctx);
+       return ret;
+}
 
-       idmap_tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDWR, 0);
+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 (idmap_tdb == NULL) {
-               d_printf("Could not open idmap: %s\n", argv[0]);
+       if (argc != 1) {
+               net_idmap_autorid_delete_ranges_usage();
                return -1;
        }
 
-       fstrcpy(sid, argv[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[] = {
+               {
+                       "mapping",
+                       net_idmap_delete_mapping,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Delete ID mapping"),
+                       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}
+       };
+
+       return net_run_function(c, argc, argv, "net idmap delete", func);
+}
+
+
+static int net_idmap_set_mapping(struct net_context *c,
+                                int argc, const char **argv)
+{
+       d_printf("%s\n", _("Not implemented yet"));
+       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;
+       }
 
-       if (strncmp(sid, "S-1-5-", strlen("S-1-5-")) != 0) {
-               d_printf("Can only delete SIDs, %s is does not start with "
-                        "S-1-5-\n", sid);
+       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;
        }
 
-       key.dptr = sid;
-       key.dsize = strlen(key.dptr)+1;
+       domsid = argv[1];
 
-       data = tdb_fetch(idmap_tdb, key);
+       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;
+}
 
-       if (data.dptr == NULL) {
-               d_printf("Could not find sid %s\n", argv[1]);
+static bool idmap_store_secret(const char *backend,
+                              const char *domain,
+                              const char *identity,
+                              const char *secret)
+{
+       char *tmp;
+       int r;
+       bool ret;
+
+       r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain);
+
+       if (r < 0) return false;
+
+       /* make sure the key is case insensitive */
+       if (!strupper_m(tmp)) {
+               free(tmp);
+               return false;
+       }
+       ret = secrets_store_generic(tmp, identity, secret);
+
+       free(tmp);
+       return ret;
+}
+
+
+static int net_idmap_secret(struct net_context *c, int argc, const char **argv)
+{
+       TALLOC_CTX *ctx;
+       const char *secret;
+       const char *dn;
+       char *domain;
+       char *backend;
+       char *opt = NULL;
+       bool ret;
+
+       if (argc != 2 || c->display_usage) {
+               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"
+                          "    secret\tNew secret to set.\n"));
+               return c->display_usage?0:-1;
+       }
+
+       secret = argv[1];
+
+       ctx = talloc_new(NULL);
+       ALLOC_CHECK(ctx);
+
+       domain = talloc_strdup(ctx, argv[0]);
+       ALLOC_CHECK(domain);
+
+       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);
+
+       if ((!backend) || (!strequal(backend, "ldap") &&
+                          !strequal(backend, "rfc2307"))) {
+               d_fprintf(stderr,
+                         _("The only currently supported backend are LDAP "
+                           "and rfc2307\n"));
+               talloc_free(ctx);
                return -1;
        }
 
-       if (tdb_delete(idmap_tdb, key) != 0) {
-               d_printf("Could not delete key %s\n", argv[1]);
+       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;
        }
 
-       if (tdb_delete(idmap_tdb, data) != 0) {
-               d_printf("Could not delete key %s\n", data.dptr);
+       ret = idmap_store_secret("ldap", domain, dn, secret);
+
+       if ( ! ret) {
+               d_fprintf(stderr, _("Failed to store secret\n"));
+               talloc_free(ctx);
                return -1;
        }
 
+       d_printf(_("Secret stored\n"));
        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;
+       }
 
-int net_help_idmap(int argc, const char **argv)
+       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)
 {
-       d_printf("net idmap dump <tdbfile>"\
-                "\n  Dump current id mapping\n");
+       struct functable func[] = {
+               {
+                       "mapping",
+                       net_idmap_set_mapping,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Not implemented yet"),
+                       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,
+                       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}
+       };
 
-       d_printf("net idmap restore"\
-                "\n  Restore entries from stdin to current local idmap\n");
+       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"));
+}
 
-       /* Deliberately *not* document net idmap delete */
 
-       return -1;
+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)
+{
+       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",
+                        _("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"
+                          "    --force,-f\tforce\n"
+                          "    --lock,-l\tlock db while doing the check\n"
+                          "    TDB\tidmap database\n"));
+               return c->display_usage ? 0 : -1;
+       }
+
+       if (argc > 0) {
+               dbfile = talloc_strdup(talloc_tos(), argv[0]);
+       } else {
+               dbfile = net_idmap_dbfile(c, &ctx);
+       }
+       if (dbfile == NULL) {
+               return -1;
+       }
+
+       if (ctx.backend != TDB) {
+               d_fprintf(stderr, _("Sorry, checking of non-TDB databases is "
+                                   "currently not supported\n"));
+               talloc_free(dbfile);
+               return -1;
+       }
+
+       d_fprintf(stderr, _("check database: %s\n"), dbfile);
+
+       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,
+       };
+
+       ret = net_idmap_check_db(dbfile, &opts);
+       talloc_free(dbfile);
+       return ret;
 }
 
 /***********************************************************
  Look at the current idmap
  **********************************************************/
-int net_idmap(int argc, const char **argv)
+int net_idmap(struct net_context *c, int argc, const char **argv)
 {
        struct functable func[] = {
-               {"dump", net_idmap_dump},
-               {"restore", net_idmap_restore},
-               {"delete", net_idmap_delete},
-               {"help", net_help_idmap},
-               {NULL, NULL}
+               {
+                       "dump",
+                       net_idmap_dump,
+                       NET_TRANSPORT_LOCAL,
+                       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 a file or stdin"),
+                       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,
+                       NET_TRANSPORT_LOCAL,
+                       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_("Delete entries from the ID mapping database"),
+                       N_("net idmap delete\n"
+                          "  Delete entries from the ID mapping database")
+               },
+               {
+                       "check",
+                       net_idmap_check,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Check id mappings"),
+                       N_("net idmap check\n"
+                          "  Check id mappings")
+               },
+               {NULL, NULL, 0, NULL, NULL}
        };
 
-       return net_run_function(argc, argv, func, net_help_idmap);
+       return net_run_function(c, argc, argv, "net idmap", func);
 }