From d55e351848aa13d3925c8510e34571d8c44ac341 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 8 Aug 2001 03:04:55 +0000 Subject: [PATCH] this fixes the problem with smbstatus reporting "Failing to initialize locking database". When calling locking_init(True), we should not try to zero of the locking.tdb or brlock.tdb since we have opened the database in read_only more. jerry --- source/locking/brlock.c | 2 +- source/locking/locking.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/locking/brlock.c b/source/locking/brlock.c index 1982d9982c2..2e7ced2fb15 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -176,7 +176,7 @@ void brl_init(int read_only) if (tdb) return; - tdb = tdb_open_log(lock_path("brlock.tdb"), 0, TDB_CLEAR_IF_FIRST|USE_TDB_MMAP_FLAG, + tdb = tdb_open_log(lock_path("brlock.tdb"), 0, USE_TDB_MMAP_FLAG|(read_only?0x0:TDB_CLEAR_IF_FIRST), read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644); if (!tdb) { DEBUG(0,("Failed to open byte range locking database\n")); diff --git a/source/locking/locking.c b/source/locking/locking.c index 9b393ed6bac..ea9f8b48ba9 100644 --- a/source/locking/locking.c +++ b/source/locking/locking.c @@ -295,7 +295,7 @@ BOOL locking_init(int read_only) return True; tdb = tdb_open_log(lock_path("locking.tdb"), - 0, TDB_CLEAR_IF_FIRST|USE_TDB_MMAP_FLAG, + 0, USE_TDB_MMAP_FLAG|(read_only?0x0:TDB_CLEAR_IF_FIRST), read_only?O_RDONLY:O_RDWR|O_CREAT, 0644); -- 2.11.4.GIT