summaryrefslogtreecommitdiff
path: root/source3/locking/locking.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-06-04 17:26:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:53 -0500
commit386a11f49eff2ec60d75b9966ecdc5627b259f0d (patch)
tree2cc5604ce524425236761867800bdb8c162ecf26 /source3/locking/locking.c
parent596eacea722d6b66cf0a7556e20545c77ee0b8e7 (diff)
downloadsamba-386a11f49eff2ec60d75b9966ecdc5627b259f0d.tar.gz
samba-386a11f49eff2ec60d75b9966ecdc5627b259f0d.tar.bz2
samba-386a11f49eff2ec60d75b9966ecdc5627b259f0d.zip
r1011: fix bad merge (from a few months ago) and ensure that we always use tdb_open_log() instead of tdb_open_ex()
(This used to be commit e65564ab4aa1240e84b8d272510aa770cad0ed0e)
Diffstat (limited to 'source3/locking/locking.c')
-rw-r--r--source3/locking/locking.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 2a27d7d4cd..fd03a25940 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -283,10 +283,10 @@ BOOL locking_init(int read_only)
if (tdb)
return True;
- tdb = tdb_open_ex(lock_path("locking.tdb"),
+ tdb = tdb_open_log(lock_path("locking.tdb"),
0, TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST),
read_only?O_RDONLY:O_RDWR|O_CREAT,
- 0644, smbd_tdb_log);
+ 0644);
if (!tdb) {
DEBUG(0,("ERROR: Failed to initialise locking database\n"));