diff options
| -rw-r--r-- | source3/groupdb/mapping_tdb.c | 2 | ||||
| -rw-r--r-- | source3/include/util_tdb.h | 2 | ||||
| -rw-r--r-- | source3/lib/util_tdb.c | 17 |
3 files changed, 1 insertions, 20 deletions
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c index 6732e3c42e..9f2b250cca 100644 --- a/source3/groupdb/mapping_tdb.c +++ b/source3/groupdb/mapping_tdb.c @@ -76,7 +76,7 @@ static bool init_group_mapping(void) /* if its an unknown version we remove everthing in the db */ if (vers_id != DATABASE_VERSION_V2) { - tdb_wipe(tdb); + tdb_wipe_all(tdb); tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2); } diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h index f9049c33b0..fcc723c511 100644 --- a/source3/include/util_tdb.h +++ b/source3/include/util_tdb.h @@ -77,8 +77,6 @@ int32 tdb_change_int32_atomic(struct tdb_context *tdb, const char *keystr, int32 bool tdb_change_uint32_atomic(TDB_CONTEXT *tdb, const char *keystr, uint32 *oldval, uint32 change_val); -int tdb_wipe(TDB_CONTEXT *tdb); - int tdb_store_bystring(struct tdb_context *tdb, const char *keystr, TDB_DATA data, int flags); int tdb_trans_store_bystring(TDB_CONTEXT *tdb, const char *keystr, TDB_DATA data, int flags); diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index e9c2d31637..ce5e77f8f4 100644 --- a/source3/lib/util_tdb.c +++ b/source3/lib/util_tdb.c @@ -719,23 +719,6 @@ TDB_CONTEXT *tdb_open_log(const char *name, int hash_size, int tdb_flags, return tdb; } -/**************************************************************************** - Allow tdb_delete to be used as a tdb_traversal_fn. -****************************************************************************/ - -static int tdb_traverse_delete_fn(TDB_CONTEXT *the_tdb, TDB_DATA key, - TDB_DATA dbuf, void *state) -{ - return tdb_delete(the_tdb, key); -} - -int tdb_wipe(TDB_CONTEXT *tdb) -{ - return tdb_traverse(tdb, tdb_traverse_delete_fn, NULL); -} - - - /** * Search across the whole tdb for keys that match the given pattern |