summaryrefslogtreecommitdiffstats
path: root/source3/locking
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-09-27 05:46:07 -0700
committerJeremy Allison <jra@samba.org>2010-09-27 17:18:54 -0700
commitf98d217514433cd06887f8c0217a7835392f0375 (patch)
treec7bf61f24c3381c9f7996a0a19045d36af3f0783 /source3/locking
parent66761423474edc9736a8a6eae6feaaf958d89d0e (diff)
downloadsamba-f98d217514433cd06887f8c0217a7835392f0375.tar.gz
samba-f98d217514433cd06887f8c0217a7835392f0375.tar.xz
samba-f98d217514433cd06887f8c0217a7835392f0375.zip
Change to using TDB_INCOMPATIBLE_HASH (the jenkins hash) on all
TDB_CLEAR_IF_FIRST tdb's. For tdb's like gencache where we open without CLEAR_IF_FIRST and then with CLEAR_IF_FIRST if corrupt this is still safe to use as if opening an existing tdb the new hash will be ignored - it's only used on creating a new tdb not opening an old one. Jeremy.
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/brlock.c2
-rw-r--r--source3/locking/locking.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 408917ef2e..3cb94871cc 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -273,7 +273,7 @@ void brl_init(bool read_only)
return;
}
- tdb_flags = TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST;
+ tdb_flags = TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH;
if (!lp_clustering()) {
/*
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 89bd19a710..ed07d7a25a 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -437,7 +437,7 @@ static bool locking_init_internal(bool read_only)
lock_db = db_open(NULL, lock_path("locking.tdb"),
lp_open_files_db_hash_size(),
- TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST,
+ TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
read_only?O_RDONLY:O_RDWR|O_CREAT, 0644);
if (!lock_db) {