dbwrap: dbwrap_store_int32->dbwrap_store_int32_bystring
[kai/samba.git] / source3 / utils / net_idmap.c
index f5b4bf1b4a74c2906daec168ff7a2d11d12686c7..28f9ed938eeca636b774adef9ed8b1727abb3dfc 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 "../utils/net.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"
+
+#define ALLOC_CHECK(mem) do { \
+       if (!mem) { \
+               d_fprintf(stderr, _("Out of memory!\n")); \
+               talloc_free(ctx); \
+               return -1; \
+       } } while(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,
+static int net_idmap_dump_one_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 (strcmp((char *)key.dptr, "USER HWM") == 0) {
+               printf(_("USER HWM %d\n"), IVAL(value.dptr,0));
                return 0;
        }
 
-       if (strcmp(key.dptr, "GROUP HWM") == 0) {
-               printf("GROUP HWM %d\n", IVAL(data.dptr,0));
+       if (strcmp((char *)key.dptr, "GROUP HWM") == 0) {
+               printf(_("GROUP HWM %d\n"), IVAL(value.dptr,0));
                return 0;
        }
 
-       if (strncmp(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)
+{
+       const char* dbfile = 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(lp_idmap_backend(), "tdb")) {
+               dbfile = state_path("winbindd_idmap.tdb");
+               if (dbfile == NULL) {
+                       d_fprintf(stderr, _("Out of memory!\n"));
+               }
+       } else if (strequal(lp_idmap_backend(), "tdb2")) {
+               dbfile = lp_parm_talloc_string(-1, "tdb", "idmap2.tdb", NULL);
+               if (dbfile == NULL) {
+                       dbfile = talloc_asprintf(talloc_tos(), "%s/idmap2.tdb",
+                                                lp_private_dir());
+               }
+               if (dbfile == NULL) {
+                       d_fprintf(stderr, _("Out of memory!\n"));
+               }
+       } else {
+               char* backend = talloc_strdup(talloc_tos(), lp_idmap_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;
+}
+
 /***********************************************************
  Dump the current idmap
  **********************************************************/
-static int net_idmap_dump(int argc, const char **argv)
+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;
+
+       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;
+       }
 
-       if ( argc != 1 )
-               return net_help_idmap( argc, argv );
+       mem_ctx = talloc_stackframe();
 
-       idmap_tdb = tdb_open_log(argv[0], 0, TDB_DEFAULT, O_RDONLY, 0);
+       dbfile = (argc > 0) ? argv[0] : net_idmap_dbfile(c);
+       if (dbfile == NULL) {
+               goto done;
+       }
+       d_fprintf(stderr, _("dumping id mapping from %s\n"), dbfile);
 
-       if (idmap_tdb == NULL) {
-               d_printf("Could not open idmap: %s\n", argv[0]);
-               return -1;
+       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);
+       status = dbwrap_traverse_read(db, net_idmap_dump_one_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;
 }
 
 /***********************************************************
- Fix up the HWMs after a idmap restore.
+ Write entries from stdin to current local idmap
  **********************************************************/
 
-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)
+static int net_idmap_store_id_mapping(struct db_context *db,
+                                     enum id_type type,
+                                     unsigned long idval,
+                                     const char *sid_string)
 {
-       struct hwms *hwms = (struct hwms *)handle;
-       int *idptr = NULL;
-       int id;
+       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;
+}
 
-       if (strncmp(key.dptr, "S-", 2) != 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;
+
+       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();
 
-       if (sscanf(data.dptr, "GID %d", &id) == 1) {
-               idptr = &hwms->group_hwm;
+       dbfile = net_idmap_dbfile(c);
+
+       if (dbfile == NULL) {
+               ret = -1;
+               goto done;
        }
 
-       if (sscanf(data.dptr, "UID %d", &id) == 1) {
-               idptr = &hwms->user_hwm;
+       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;
        }
 
-       if (idptr == NULL) {
-               d_printf("Illegal idmap entry: [%s]->[%s]\n",
-                        key.dptr, data.dptr);
-               hwms->ok = False;
-               return -1;
+       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 (*idptr <= id)
-               *idptr = id+1;
+       if (dbwrap_transaction_start(db) != 0) {
+               d_fprintf(stderr, _("Failed to start transaction.\n"));
+               ret = -1;
+               goto done;
+       }
 
-       return 0;
+       while (!feof(input)) {
+               char line[128], sid_string[128];
+               int len;
+               unsigned long idval;
+               NTSTATUS status;
+
+               if (fgets(line, 127, input) == NULL)
+                       break;
+
+               len = strlen(line);
+
+               if ( (len > 0) && (line[len-1] == '\n') )
+                       line[len-1] = '\0';
+
+               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) {
+                       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 (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"));
+               }
+       }
+
+done:
+       if ((input != NULL) && (input != stdin)) {
+               fclose(input);
+       }
+
+       talloc_free(mem_ctx);
+       return ret;
 }
 
-static NTSTATUS net_idmap_fixup_hwm(void)
+static
+NTSTATUS dbwrap_delete_mapping(struct db_context *db, TDB_DATA key1, bool force)
 {
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       TDB_CONTEXT *idmap_tdb;
-       char *tdbfile = NULL;
+       TALLOC_CTX* mem_ctx = talloc_tos();
+       struct db_record *rec1=NULL, *rec2=NULL;
+       TDB_DATA key2;
+       bool is_valid_mapping;
+       NTSTATUS status = NT_STATUS_OK;
+       TDB_DATA value;
+
+       rec1 = dbwrap_fetch_locked(db, mem_ctx, key1);
+       if (rec1 == NULL) {
+               DEBUG(1, ("failed to fetch: %.*s\n", (int)key1.dsize, key1.dptr));
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
+       }
+       key2 = dbwrap_record_get_value(rec1);
+       if (key2.dptr == NULL) {
+               DEBUG(1, ("could not find %.*s\n", (int)key1.dsize, key1.dptr));
+               status = NT_STATUS_NOT_FOUND;
+               goto done;
+       }
 
-       struct hwms hwms;
-       struct hwms highest;
+       DEBUG(2, ("mapping: %.*s -> %.*s\n",
+                 (int)key1.dsize, key1.dptr, (int)key2.dsize, key2.dptr));
 
-       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;
+       rec2 = dbwrap_fetch_locked(db, mem_ctx, key2);
+       if (rec2 == NULL) {
+               DEBUG(1, ("failed to fetch: %.*s\n", (int)key2.dsize, key2.dptr));
+               status = NT_STATUS_NO_MEMORY;
+               goto done;
        }
 
-       tdbfile = strdup(lock_path("winbindd_idmap.tdb"));
-       if (!tdbfile) {
-               DEBUG(0, ("idmap_init: out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
+       value = dbwrap_record_get_value(rec2);
+       is_valid_mapping = tdb_data_equal(key1, value);
+
+       if (!is_valid_mapping) {
+               DEBUG(1, ("invalid mapping: %.*s -> %.*s -> %.*s\n",
+                         (int)key1.dsize, key1.dptr, (int)key2.dsize, key2.dptr,
+                         (int)value.dsize, value.dptr ));
+               if ( !force ) {
+                       status = NT_STATUS_FILE_INVALID;
+                       goto done;
+               }
        }
 
-       idmap_tdb = tdb_open_log(tdbfile, 0, TDB_DEFAULT, O_RDWR, 0);
+       status = dbwrap_record_delete(rec1);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("failed to delete: %.*s\n", (int)key1.dsize, key1.dptr));
+               goto done;
+       }
 
-       if (idmap_tdb == NULL) {
-               d_printf("Could not open idmap: %s\n", tdbfile);
-               return NT_STATUS_NO_SUCH_FILE;
+       if (is_valid_mapping) {
+               status = dbwrap_record_delete(rec2);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(1, ("failed to delete: %.*s\n", (int)key2.dsize, key2.dptr));
+               }
        }
+done:
+       TALLOC_FREE(rec1);
+       TALLOC_FREE(rec2);
+       return status;
+}
 
-       hwms.ok = True;
+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);
+}
 
-       tdb_traverse(idmap_tdb, net_idmap_find_max_id, &hwms);
+/***********************************************************
+ 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;
+}
 
-       if (!hwms.ok) {
-               goto done;
+static int net_idmap_delete(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;
+
+       if ( !delete_args_ok(argc,argv) || c->display_usage) {
+               d_printf("%s\n%s",
+                        _("Usage:"),
+                        _("net idmap delete [-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;
        }
 
-       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 = net_idmap_dbfile(c);
+       if (dbfile == NULL) {
                goto done;
        }
+       d_fprintf(stderr, _("deleting 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_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;
        }
 
-       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");
+       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;
+}
 
-       result = NT_STATUS_OK;
- done:
-       tdb_close(idmap_tdb);
-       return result;
+static int net_idmap_set(struct net_context *c, int argc, const char **argv)
+{
+       d_printf("%s\n", _("Not implemented yet"));
+       return -1;
 }
+static bool idmap_store_secret(const char *backend,
+                              const char *domain,
+                              const char *identity,
+                              const char *secret)
+{
+       char *tmp;
+       int r;
+       bool ret;
 
-/***********************************************************
- Write entries from stdin to current local idmap
- **********************************************************/
-static int net_idmap_restore(int argc, const char **argv)
+       r = asprintf(&tmp, "IDMAP_%s_%s", backend, domain);
+
+       if (r < 0) return false;
+
+       strupper_m(tmp); /* make sure the key is case insensitive */
+       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)
 {
-       if (!idmap_init(lp_idmap_backend())) {
-               d_printf("Could not init idmap\n");
-               return -1;
+       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 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;
        }
 
-       while (!feof(stdin)) {
-               fstring line, sid_string;
-               int len;
-               unid_t id;
-               int type = ID_EMPTY;
-               DOM_SID sid;
+       secret = argv[1];
 
-               if (fgets(line, sizeof(line)-1, stdin) == NULL)
-                       break;
+       ctx = talloc_new(NULL);
+       ALLOC_CHECK(ctx);
 
-               len = strlen(line);
+       domain = talloc_strdup(ctx, argv[0]);
+       ALLOC_CHECK(domain);
 
-               if ( (len > 0) && (line[len-1] == '\n') )
-                       line[len-1] = '\0';
+       opt = talloc_asprintf(ctx, "idmap config %s", domain);
+       ALLOC_CHECK(opt);
 
-               /* Yuck - this is broken for sizeof(gid_t) != sizeof(int) */
+       backend = talloc_strdup(ctx, lp_parm_const_string(-1, opt, "backend", "tdb"));
+       ALLOC_CHECK(backend);
 
-               if (sscanf(line, "GID %d %s", &id.gid, sid_string) == 2) {
-                       type = ID_GROUPID;
-               }
+       if ( ( ! backend) || ( ! strequal(backend, "ldap"))) {
+               d_fprintf(stderr,
+                         _("The only currently supported backend is LDAP\n"));
+               talloc_free(ctx);
+               return -1;
+       }
 
-               /* Yuck - this is broken for sizeof(uid_t) != sizeof(int) */
+       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 (sscanf(line, "UID %d %s", &id.uid, sid_string) == 2) {
-                       type = ID_USERID;
-               }
+       ret = idmap_store_secret("ldap", domain, dn, secret);
 
-               if (type == ID_EMPTY) {
-                       d_printf("ignoring invalid line [%s]\n", line);
-                       continue;
-               }
+       if ( ! ret) {
+               d_fprintf(stderr, _("Failed to store secret\n"));
+               talloc_free(ctx);
+               return -1;
+       }
 
-               if (!string_to_sid(&sid, sid_string)) {
-                       d_printf("ignoring invalid sid [%s]\n", sid_string);
-                       continue;
-               }
+       d_printf(_("Secret stored\n"));
+       return 0;
+}
 
-               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;
-               }
-                                
+static int net_idmap_check(struct net_context *c, int argc, const char **argv)
+{
+       const char* dbfile;
+       struct check_options opts;
+
+       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;
        }
 
-       idmap_close();
+       dbfile = (argc > 0) ? argv[0] : net_idmap_dbfile(c);
+       if (dbfile == NULL) {
+               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,
+       };
 
-       return NT_STATUS_IS_OK(net_idmap_fixup_hwm()) ? 0 : -1;
+       return net_idmap_check_db(dbfile, &opts);
 }
 
-int net_help_idmap(int argc, const char **argv)
+static int net_idmap_aclmapset(struct net_context *c, int argc, const char **argv)
 {
-       d_printf("net idmap dump filename"\
-                "\n  Dump current id mapping\n");
+       TALLOC_CTX *mem_ctx;
+       int result = -1;
+       struct 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, "%s net idmap aclmapset <tdb> "
+                         "<src-sid> <dst-sid>\n", _("Usage:"));
+               return -1;
+       }
 
-       d_printf("net idmap restore"\
-                "\n  Restore entries from stdin to current local idmap\n");
+       if (!(mem_ctx = talloc_init("net idmap aclmapset"))) {
+               d_fprintf(stderr, _("talloc_init failed\n"));
+               return -1;
+       }
 
-       return -1;
+       if (!(db = db_open(mem_ctx, argv[0], 0, TDB_DEFAULT,
+                          O_RDWR|O_CREAT, 0600,
+                          DBWRAP_LOCK_ORDER_1))) {
+               d_fprintf(stderr, _("db_open failed: %s\n"), strerror(errno));
+               goto fail;
+       }
+
+       if (!string_to_sid(&src_sid, argv[1])) {
+               d_fprintf(stderr, _("%s is not a valid sid\n"), argv[1]);
+               goto fail;
+       }
+
+       if (!string_to_sid(&dst_sid, argv[2])) {
+               d_fprintf(stderr, _("%s is not a valid sid\n"), argv[2]);
+               goto fail;
+       }
+
+       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;
+       }
+
+       if (!(rec = dbwrap_fetch_locked(
+                     db, mem_ctx, string_term_tdb_data(src)))) {
+               d_fprintf(stderr, _("could not fetch db record\n"));
+               goto fail;
+       }
+
+       status = dbwrap_record_store(rec, string_term_tdb_data(dst), 0);
+       TALLOC_FREE(rec);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, _("could not store record: %s\n"),
+                         nt_errstr(status));
+               goto fail;
+       }
+
+       result = 0;
+fail:
+       TALLOC_FREE(mem_ctx);
+       return result;
 }
 
 /***********************************************************
  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},
-               {"help", net_help_idmap},
-               {NULL, NULL}
+               {
+                       "dump",
+                       net_idmap_dump,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Dump the current ID mappings"),
+                       N_("net idmap dump\n"
+                          "  Dump the current ID mappings")
+               },
+               {
+                       "restore",
+                       net_idmap_restore,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Restore entries from stdin"),
+                       N_("net idmap restore\n"
+                          "  Restore entries from stdin")
+               },
+               {
+                       "setmap",
+                       net_idmap_set,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Not implemented yet"),
+                       N_("net idmap setmap\n"
+                          "  Not implemented yet")
+               },
+               {
+                       "delete",
+                       net_idmap_delete,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Delete ID mapping"),
+                       N_("net idmap delete <ID>\n"
+                          "  Delete ID mapping")
+               },
+               {
+                       "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")
+               },
+               {
+                       "aclmapset",
+                       net_idmap_aclmapset,
+                       NET_TRANSPORT_LOCAL,
+                       N_("Set acl map"),
+                       N_("net idmap aclmapset\n"
+                          "  Set acl map")
+               },
+               {
+                       "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);
 }