summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-03-17 14:40:07 +0100
committerVolker Lendecke <vl@samba.org>2008-03-17 14:56:45 +0100
commit170995493376e926b7b30791286598ad6b7af4a4 (patch)
treebcde65b717820e933da4071e8a42899c3c2e4e97 /source3/locking
parent3c02b180d029336fe07a86258c38fe4b47ad5091 (diff)
downloadsamba-170995493376e926b7b30791286598ad6b7af4a4.tar.gz
samba-170995493376e926b7b30791286598ad6b7af4a4.tar.bz2
samba-170995493376e926b7b30791286598ad6b7af4a4.zip
Merge leftovers of 0e1a86bc845 in 3-0-ctdb
(This used to be commit 64b1625f8e3bca43504871747bef6631e1b18f44)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/brlock.c2
-rw-r--r--source3/locking/locking.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 341d00f3fe..940dfbff8f 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -265,7 +265,7 @@ void brl_init(bool read_only)
}
brlock_db = db_open(NULL, lock_path("brlock.tdb"),
lp_open_files_db_hash_size(),
- TDB_DEFAULT | TDB_CLEAR_IF_FIRST,
+ TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST,
read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644 );
if (!brlock_db) {
DEBUG(0,("Failed to open byte range locking database %s\n",
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 513bb31d9d..782e10fb7c 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -392,10 +392,9 @@ static bool locking_init_internal(bool read_only)
if (lock_db)
return True;
- lock_db = db_open(NULL, lock_path("locking.tdb"), 0,
- TDB_DEFAULT
- |TDB_VOLATILE
- |(read_only?0x0:TDB_CLEAR_IF_FIRST),
+ lock_db = db_open(NULL, lock_path("locking.tdb"),
+ lp_open_files_db_hash_size(),
+ TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST,
read_only?O_RDONLY:O_RDWR|O_CREAT, 0644);
if (!lock_db) {