summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/sharesec.c2
-rw-r--r--source3/lib/util_tdb.c10
2 files changed, 9 insertions, 3 deletions
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index f6ff701d5b..60f6e5077b 100644
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -65,7 +65,7 @@ static bool share_info_db_init(void)
}
if (vers_id != SHARE_DATABASE_VERSION_V2) {
- tdb_traverse(share_tdb, tdb_traverse_delete_fn, NULL);
+ tdb_wipe(share_tdb);
tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2);
}
tdb_unlock_bystring(share_tdb, vstring);
diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c
index 4ecb4d5b81..4332a7948f 100644
--- a/source3/lib/util_tdb.c
+++ b/source3/lib/util_tdb.c
@@ -722,12 +722,18 @@ TDB_CONTEXT *tdb_open_log(const char *name, int hash_size, int tdb_flags,
Allow tdb_delete to be used as a tdb_traversal_fn.
****************************************************************************/
-int tdb_traverse_delete_fn(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf,
- void *state)
+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);
+}
+
+
/**