sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-04 16:58:42 +03:00
Code

Merge leftovers of 0e1a86bc845 in 3-0-ctdb

Browse Source 
(This used to be commit 64b1625f8e3bca43504871747bef6631e1b18f44)
This commit is contained in:
Volker Lendecke 2008-03-17 14:40:07 +01:00
parent 3c02b180d0
commit 1709954933
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/locking/brlock.c
View File

@ -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",

7
source3/locking/locking.c
View File

@ -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) {