s3:idmap_tdb2: don't call smb_register_idmap_alloc() in idmap_tdb2_init
[amitay/samba.git] / source3 / winbindd / idmap_tdb2.c
index b2723270ebc532da512d261c5dbf5ce3797e8bec..e546d4459415a9c4c3a17a7347537ac647d9ddfc 100644 (file)
    Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
    Copyright (C) Jeremy Allison 2006
    Copyright (C) Simo Sorce 2003-2006
-   
+
    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
    (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.
@@ -97,7 +97,7 @@ static NTSTATUS idmap_tdb2_load_ranges(void)
 static NTSTATUS idmap_tdb2_open_db(void)
 {
        char *db_path;
-       
+
        if (idmap_tdb2) {
                /* its already open */
                return NT_STATUS_OK;
@@ -193,96 +193,68 @@ static NTSTATUS idmap_tdb2_alloc_init(const char *params)
 /*
   Allocate a new id. 
 */
-static NTSTATUS idmap_tdb2_allocate_id(struct unixid *xid)
-{
-       bool ret;
+
+struct idmap_tdb2_allocate_id_context {
        const char *hwmkey;
        const char *hwmtype;
        uint32_t high_hwm;
        uint32_t hwm;
-       int res;
-       NTSTATUS status;
-
-       status = idmap_tdb2_open_db();
-       NT_STATUS_NOT_OK_RETURN(status);
-
-       /* Get current high water mark */
-       switch (xid->type) {
-
-       case ID_TYPE_UID:
-               hwmkey = HWM_USER;
-               hwmtype = "UID";
-               high_hwm = idmap_tdb2_state.high_uid;
-               break;
-
-       case ID_TYPE_GID:
-               hwmkey = HWM_GROUP;
-               hwmtype = "GID";
-               high_hwm = idmap_tdb2_state.high_gid;
-               break;
+};
 
-       default:
-               DEBUG(2, ("Invalid ID type (0x%x)\n", xid->type));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
+static NTSTATUS idmap_tdb2_allocate_id_action(struct db_context *db,
+                                             void *private_data)
+{
+       NTSTATUS ret;
+       struct idmap_tdb2_allocate_id_context *state;
+       uint32_t hwm;
 
-       res = idmap_tdb2->transaction_start(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to start transaction\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
+       state = (struct idmap_tdb2_allocate_id_context *)private_data;
 
-       if ((hwm = dbwrap_fetch_int32(idmap_tdb2, hwmkey)) == -1) {
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_INTERNAL_DB_ERROR;
+       hwm = dbwrap_fetch_int32(db, state->hwmkey);
+       if (hwm == -1) {
+               ret = NT_STATUS_INTERNAL_DB_ERROR;
+               goto done;
        }
 
        /* check it is in the range */
-       if (hwm > high_hwm) {
-               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n", 
-                         hwmtype, (unsigned long)high_hwm));
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_UNSUCCESSFUL;
+       if (hwm > state->high_hwm) {
+               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n",
+                         state->hwmtype, (unsigned long)state->high_hwm));
+               ret = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
        /* fetch a new id and increment it */
-       ret = dbwrap_change_uint32_atomic(idmap_tdb2, hwmkey, &hwm, 1);
-       if (ret == -1) {
-               DEBUG(1, ("Fatal error while fetching a new %s value\n!", hwmtype));
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_UNSUCCESSFUL;
+       ret = dbwrap_trans_change_uint32_atomic(db, state->hwmkey, &hwm, 1);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(1, ("Fatal error while fetching a new %s value\n!",
+                         state->hwmtype));
+               goto done;
        }
 
        /* recheck it is in the range */
-       if (hwm > high_hwm) {
-               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n", 
-                         hwmtype, (unsigned long)high_hwm));
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-               return NT_STATUS_UNSUCCESSFUL;
+       if (hwm > state->high_hwm) {
+               DEBUG(1, ("Fatal Error: %s range full!! (max: %lu)\n",
+                         state->hwmtype, (unsigned long)state->high_hwm));
+               ret = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
-       res = idmap_tdb2->transaction_commit(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to commit transaction\n"));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-       
-       xid->id = hwm;
-       DEBUG(10,("New %s = %d\n", hwmtype, hwm));
+       ret = NT_STATUS_OK;
+       state->hwm = hwm;
 
-       return NT_STATUS_OK;
+done:
+       return ret;
 }
 
-/*
-  Get current highest id. 
-*/
-static NTSTATUS idmap_tdb2_get_hwm(struct unixid *xid)
+static NTSTATUS idmap_tdb2_allocate_id(struct unixid *xid)
 {
        const char *hwmkey;
        const char *hwmtype;
-       uint32_t hwm;
        uint32_t high_hwm;
+       uint32_t hwm = 0;
        NTSTATUS status;
+       struct idmap_tdb2_allocate_id_context state;
 
        status = idmap_tdb2_open_db();
        NT_STATUS_NOT_OK_RETURN(status);
@@ -303,33 +275,26 @@ static NTSTATUS idmap_tdb2_get_hwm(struct unixid *xid)
                break;
 
        default:
+               DEBUG(2, ("Invalid ID type (0x%x)\n", xid->type));
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if ((hwm = dbwrap_fetch_int32(idmap_tdb2, hwmkey)) == -1) {
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
+       state.hwm = hwm;
+       state.high_hwm = high_hwm;
+       state.hwmtype = hwmtype;
+       state.hwmkey = hwmkey;
 
-       xid->id = hwm;
+       status = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_allocate_id_action,
+                                &state);
 
-       /* Warn if it is out of range */
-       if (hwm >= high_hwm) {
-               DEBUG(0, ("Warning: %s range full!! (max: %lu)\n", 
-                         hwmtype, (unsigned long)high_hwm));
+       if (NT_STATUS_IS_OK(status)) {
+               xid->id = state.hwm;
+               DEBUG(10,("New %s = %d\n", hwmtype, state.hwm));
+       } else {
+               DEBUG(1, ("Error allocating a new %s\n", hwmtype));
        }
 
-       return NT_STATUS_OK;
-}
-
-/*
-  Set high id. 
-*/
-static NTSTATUS idmap_tdb2_set_hwm(struct unixid *xid)
-{
-       /* not supported, or we would invalidate the cache tdb on
-          other nodes */
-       DEBUG(0,("idmap_tdb2_set_hwm not supported\n"));
-       return NT_STATUS_NOT_SUPPORTED;
+       return status;
 }
 
 /*
@@ -357,8 +322,6 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom,
 {
        NTSTATUS ret;
        struct idmap_tdb2_context *ctx;
-       char *config_option = NULL;
-       const char *range;
        NTSTATUS status;
 
        status = idmap_tdb2_open_db();
@@ -370,24 +333,63 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom,
                return NT_STATUS_NO_MEMORY;
        }
 
-       config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
-       if ( ! config_option) {
-               DEBUG(0, ("Out of memory!\n"));
-               ret = NT_STATUS_NO_MEMORY;
-               goto failed;
+       if (strequal(dom->name, "*")) {
+               uid_t low_uid = 0;
+               uid_t high_uid = 0;
+               gid_t low_gid = 0;
+               gid_t high_gid = 0;
+
+               ctx->filter_low_id = 0;
+               ctx->filter_high_id = 0;
+
+               if (lp_idmap_uid(&low_uid, &high_uid)) {
+                       ctx->filter_low_id = low_uid;
+                       ctx->filter_high_id = high_uid;
+               } else {
+                       DEBUG(3, ("Warning: 'idmap uid' not set!\n"));
+               }
+
+               if (lp_idmap_gid(&low_gid, &high_gid)) {
+                       if ((low_gid != low_uid) || (high_gid != high_uid)) {
+                               DEBUG(1, ("Warning: 'idmap uid' and 'idmap gid'"
+                                     " ranges do not agree -- building "
+                                     "intersection\n"));
+                               ctx->filter_low_id = MAX(ctx->filter_low_id,
+                                                        low_gid);
+                               ctx->filter_high_id = MIN(ctx->filter_high_id,
+                                                         high_gid);
+                       }
+               } else {
+                       DEBUG(3, ("Warning: 'idmap gid' not set!\n"));
+               }
+       } else {
+               char *config_option = NULL;
+               const char *range;
+               config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
+               if ( ! config_option) {
+                       DEBUG(0, ("Out of memory!\n"));
+                       ret = NT_STATUS_NO_MEMORY;
+                       goto failed;
+               }
+
+               range = lp_parm_const_string(-1, config_option, "range", NULL);
+               if (( ! range) ||
+                   (sscanf(range, "%u - %u", &ctx->filter_low_id, &ctx->filter_high_id) != 2))
+               {
+                       ctx->filter_low_id = 0;
+                       ctx->filter_high_id = 0;
+               }
+
+               talloc_free(config_option);
        }
 
-       range = lp_parm_const_string(-1, config_option, "range", NULL);
-       if (( ! range) ||
-           (sscanf(range, "%u - %u", &ctx->filter_low_id, &ctx->filter_high_id) != 2) ||
-           (ctx->filter_low_id > ctx->filter_high_id)) {
+       if (ctx->filter_low_id > ctx->filter_high_id) {
                ctx->filter_low_id = 0;
                ctx->filter_high_id = 0;
        }
 
        dom->private_data = ctx;
 
-       talloc_free(config_option);
        return NT_STATUS_OK;
 
 failed:
@@ -395,6 +397,55 @@ failed:
        return ret;
 }
 
+struct idmap_tdb2_set_mapping_context {
+       const char *ksidstr;
+       const char *kidstr;
+};
+
+static NTSTATUS idmap_tdb2_set_mapping_action(struct db_context *db,
+                                             void *private_data)
+{
+       TDB_DATA data;
+       NTSTATUS ret;
+       struct idmap_tdb2_set_mapping_context *state;
+       TALLOC_CTX *tmp_ctx = talloc_stackframe();
+
+       state = (struct idmap_tdb2_set_mapping_context *)private_data;
+
+       DEBUG(10, ("Storing %s <-> %s map\n", state->ksidstr, state->kidstr));
+
+       /* check wheter sid mapping is already present in db */
+       data = dbwrap_fetch_bystring(db, tmp_ctx, state->ksidstr);
+       if (data.dptr) {
+               ret = NT_STATUS_OBJECT_NAME_COLLISION;
+               goto done;
+       }
+
+       ret = dbwrap_store_bystring(db, state->ksidstr,
+                                   string_term_tdb_data(state->kidstr),
+                                   TDB_INSERT);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0, ("Error storing SID -> ID: %s\n", nt_errstr(ret)));
+               goto done;
+       }
+
+       ret = dbwrap_store_bystring(db, state->kidstr,
+                                   string_term_tdb_data(state->ksidstr),
+                                   TDB_INSERT);
+       if (!NT_STATUS_IS_OK(ret)) {
+               DEBUG(0, ("Error storing ID -> SID: %s\n", nt_errstr(ret)));
+               /* try to remove the previous stored SID -> ID map */
+               dbwrap_delete_bystring(db, state->ksidstr);
+               goto done;
+       }
+
+       DEBUG(10,("Stored %s <-> %s\n", state->ksidstr, state->kidstr));
+
+done:
+       talloc_free(tmp_ctx);
+       return ret;
+}
+
 
 /*
   run a script to perform a mapping
@@ -495,7 +546,7 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
        case ID_TYPE_UID:
                keystr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
                break;
-               
+
        case ID_TYPE_GID:
                keystr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
                break;
@@ -520,7 +571,8 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
        data = dbwrap_fetch_bystring(idmap_tdb2, keystr, keystr);
 
        if (!data.dptr) {
-               fstring sidstr;
+               char *sidstr;
+               struct idmap_tdb2_set_mapping_context store_state;
 
                DEBUG(10,("Record %s not found\n", keystr));
                if (idmap_tdb2_state.idmap_script == NULL) {
@@ -535,18 +587,20 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
                        goto done;
                }
 
-               if (sid_to_fstring(sidstr, map->sid)) {
-                       /* both forward and reverse mappings */
-                       dbwrap_store_bystring(idmap_tdb2, keystr,
-                                           string_term_tdb_data(sidstr), 
-                                           TDB_REPLACE);
-                       dbwrap_store_bystring(idmap_tdb2, sidstr,
-                                           string_term_tdb_data(keystr), 
-                                           TDB_REPLACE);
+               sidstr = sid_string_talloc(keystr, map->sid);
+               if (!sidstr) {
+                       ret = NT_STATUS_NO_MEMORY;
+                       goto done;
                }
+
+               store_state.ksidstr = sidstr;
+               store_state.kidstr = keystr;
+
+               ret = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_set_mapping_action,
+                                     &store_state);
                goto done;
        }
-               
+
        if (!string_to_sid(map->sid, (const char *)data.dptr)) {
                DEBUG(10,("INVALID SID (%s) in record %s\n",
                        (const char *)data.dptr, keystr));
@@ -589,7 +643,8 @@ static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_tdb2_context *ctx, struct id_m
        /* Check if sid is present in database */
        data = dbwrap_fetch_bystring(idmap_tdb2, tmp_ctx, keystr);
        if (!data.dptr) {
-               fstring idstr;
+               char *idstr;
+               struct idmap_tdb2_set_mapping_context store_state;
 
                DEBUG(10,(__location__ " Record %s not found\n", keystr));
 
@@ -597,21 +652,39 @@ static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_tdb2_context *ctx, struct id_m
                        ret = NT_STATUS_NONE_MAPPED;
                        goto done;
                }
-                       
+
                ret = idmap_tdb2_script(ctx, map, "SIDTOID %s", keystr);
                /* store it on shared storage */
                if (!NT_STATUS_IS_OK(ret)) {
                        goto done;
                }
 
-               snprintf(idstr, sizeof(idstr), "%cID %lu", 
-                        map->xid.type == ID_TYPE_UID?'U':'G',
-                        (unsigned long)map->xid.id);
-               /* store both forward and reverse mappings */
-               dbwrap_store_bystring(idmap_tdb2, keystr, string_term_tdb_data(idstr),
-                                   TDB_REPLACE);
-               dbwrap_store_bystring(idmap_tdb2, idstr, string_term_tdb_data(keystr),
-                                   TDB_REPLACE);
+               /* apply filters before returning result */
+               if ((ctx->filter_low_id
+                    && (map->xid.id < ctx->filter_low_id)) ||
+                   (ctx->filter_high_id
+                    && (map->xid.id > ctx->filter_high_id))) {
+                       DEBUG(5, ("Script returned id (%u) out of range "
+                                 "(%u - %u). Filtered!\n",
+                                 map->xid.id,
+                                 ctx->filter_low_id, ctx->filter_high_id));
+                       ret = NT_STATUS_NONE_MAPPED;
+                       goto done;
+               }
+
+               idstr = talloc_asprintf(tmp_ctx, "%cID %lu",
+                                       map->xid.type == ID_TYPE_UID?'U':'G',
+                                       (unsigned long)map->xid.id);
+               if (idstr == NULL) {
+                       ret = NT_STATUS_NO_MEMORY;
+                       goto done;
+               }
+
+               store_state.ksidstr = keystr;
+               store_state.kidstr = idstr;
+
+               ret = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_set_mapping_action,
+                                     &store_state);
                goto done;
        }
 
@@ -631,8 +704,9 @@ static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_tdb2_context *ctx, struct id_m
        } else { /* Unknown record type ! */
                DEBUG(2, ("Found INVALID record %s -> %s\n", keystr, (const char *)data.dptr));
                ret = NT_STATUS_INTERNAL_DB_ERROR;
+               goto done;
        }
-       
+
        /* apply filters before returning result */
        if ((ctx->filter_low_id && (map->xid.id < ctx->filter_low_id)) ||
            (ctx->filter_high_id && (map->xid.id > ctx->filter_high_id))) {
@@ -659,7 +733,7 @@ static NTSTATUS idmap_tdb2_unixids_to_sids(struct idmap_domain *dom, struct id_m
        for (i = 0; ids[i]; i++) {
                ids[i]->status = ID_UNKNOWN;
        }
-       
+
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
 
        for (i = 0; ids[i]; i++) {
@@ -673,7 +747,7 @@ static NTSTATUS idmap_tdb2_unixids_to_sids(struct idmap_domain *dom, struct id_m
                                ids[i]->status = ID_UNMAPPED;
                                continue;
                        }
-                       
+
                        /* some fatal error occurred, return immediately */
                        goto done;
                }
@@ -701,7 +775,7 @@ static NTSTATUS idmap_tdb2_sids_to_unixids(struct idmap_domain *dom, struct id_m
        for (i = 0; ids[i]; i++) {
                ids[i]->status = ID_UNKNOWN;
        }
-       
+
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
 
        for (i = 0; ids[i]; i++) {
@@ -715,7 +789,7 @@ static NTSTATUS idmap_tdb2_sids_to_unixids(struct idmap_domain *dom, struct id_m
                                ids[i]->status = ID_UNMAPPED;
                                continue;
                        }
-                       
+
                        /* some fatal error occurred, return immediately */
                        goto done;
                }
@@ -734,14 +808,13 @@ done:
 /*
   set a mapping. 
 */
+
 static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id_map *map)
 {
        struct idmap_tdb2_context *ctx;
        NTSTATUS ret;
-       TDB_DATA data;
        char *ksidstr, *kidstr;
-       int res;
-       bool started_transaction = false;
+       struct idmap_tdb2_set_mapping_context state;
 
        if (!map || !map->sid) {
                return NT_STATUS_INVALID_PARAMETER;
@@ -750,7 +823,7 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id
        ksidstr = kidstr = NULL;
 
        /* TODO: should we filter a set_mapping using low/high filters ? */
-       
+
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
 
        switch (map->xid.type) {
@@ -758,7 +831,7 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id
        case ID_TYPE_UID:
                kidstr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
                break;
-               
+
        case ID_TYPE_GID:
                kidstr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
                break;
@@ -774,77 +847,25 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id
                goto done;
        }
 
-       if (!(ksidstr = sid_string_talloc(ctx, map->sid))) {
+       ksidstr = sid_string_talloc(ctx, map->sid);
+       if (ksidstr == NULL) {
                DEBUG(0, ("Out of memory!\n"));
                ret = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       DEBUG(10, ("Storing %s <-> %s map\n", ksidstr, kidstr));
-
-       res = idmap_tdb2->transaction_start(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to start transaction\n"));
-               ret = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
-
-       started_transaction = true;
-       
-       /* check wheter sid mapping is already present in db */
-       data = dbwrap_fetch_bystring(idmap_tdb2, ksidstr, ksidstr);
-       if (data.dptr) {
-               ret = NT_STATUS_OBJECT_NAME_COLLISION;
-               goto done;
-       }
-
-       ret = dbwrap_store_bystring(idmap_tdb2, ksidstr, string_term_tdb_data(kidstr),
-                                 TDB_INSERT);
-       if (!NT_STATUS_IS_OK(ret)) {
-               DEBUG(0, ("Error storing SID -> ID: %s\n", nt_errstr(ret)));
-               goto done;
-       }
-       ret = dbwrap_store_bystring(idmap_tdb2, kidstr, string_term_tdb_data(ksidstr),
-                                 TDB_INSERT);
-       if (!NT_STATUS_IS_OK(ret)) {
-               DEBUG(0, ("Error storing ID -> SID: %s\n", nt_errstr(ret)));
-               /* try to remove the previous stored SID -> ID map */
-               dbwrap_delete_bystring(idmap_tdb2, ksidstr);
-               goto done;
-       }
-
-       started_transaction = false;
-
-       res = idmap_tdb2->transaction_commit(idmap_tdb2);
-       if (res != 0) {
-               DEBUG(1,(__location__ " Failed to commit transaction\n"));
-               ret = NT_STATUS_UNSUCCESSFUL;
-               goto done;
-       }
+       state.ksidstr = ksidstr;
+       state.kidstr = kidstr;
 
-       DEBUG(10,("Stored %s <-> %s\n", ksidstr, kidstr));
-       ret = NT_STATUS_OK;
+       ret = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_set_mapping_action,
+                             &state);
 
 done:
-       if (started_transaction) {
-               idmap_tdb2->transaction_cancel(idmap_tdb2);
-       }
        talloc_free(ksidstr);
        talloc_free(kidstr);
        return ret;
 }
 
-/*
-  remove a mapping. 
-*/
-static NTSTATUS idmap_tdb2_remove_mapping(struct idmap_domain *dom, const struct id_map *map)
-{
-       /* not supported as it would invalidate the cache tdb on other
-          nodes */
-       DEBUG(0,("idmap_tdb2_remove_mapping not supported\n"));
-       return NT_STATUS_NOT_SUPPORTED;
-}
-
 /*
   Close the idmap tdb instance
 */
@@ -854,44 +875,20 @@ static NTSTATUS idmap_tdb2_close(struct idmap_domain *dom)
        return NT_STATUS_OK;
 }
 
-
-/*
-  Dump all mappings out
-*/
-static NTSTATUS idmap_tdb2_dump_data(struct idmap_domain *dom, struct id_map **maps, int *num_maps)
-{
-       DEBUG(0,("idmap_tdb2_dump_data not supported\n"));
-       return NT_STATUS_NOT_SUPPORTED;
-}
-
 static struct idmap_methods db_methods = {
        .init            = idmap_tdb2_db_init,
        .unixids_to_sids = idmap_tdb2_unixids_to_sids,
        .sids_to_unixids = idmap_tdb2_sids_to_unixids,
-       .set_mapping     = idmap_tdb2_set_mapping,
-       .remove_mapping  = idmap_tdb2_remove_mapping,
-       .dump_data       = idmap_tdb2_dump_data,
        .close_fn        = idmap_tdb2_close
 };
 
 static struct idmap_alloc_methods db_alloc_methods = {
        .init        = idmap_tdb2_alloc_init,
        .allocate_id = idmap_tdb2_allocate_id,
-       .get_id_hwm  = idmap_tdb2_get_hwm,
-       .set_id_hwm  = idmap_tdb2_set_hwm,
        .close_fn    = idmap_tdb2_alloc_close
 };
 
 NTSTATUS idmap_tdb2_init(void)
 {
-       NTSTATUS ret;
-
-       /* register both backends */
-       ret = smb_register_idmap_alloc(SMB_IDMAP_INTERFACE_VERSION, "tdb2", &db_alloc_methods);
-       if (! NT_STATUS_IS_OK(ret)) {
-               DEBUG(0, ("Unable to register idmap alloc tdb2 module: %s\n", get_friendly_nt_error_msg(ret)));
-               return ret;
-       }
-
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "tdb2", &db_methods);
 }