diff options
| author | Gerald Carter <jerry@samba.org> | 2004-02-12 05:24:02 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-02-12 05:24:02 +0000 |
| commit | df6d2db4ced5586320804950da58a62248db4d56 (patch) | |
| tree | 31d2871b863a236ebc52b455ee39899c3940eb3c /source3/locking | |
| parent | a6a2a696807992e60c905ff28828317fbcbe3913 (diff) | |
| download | samba-df6d2db4ced5586320804950da58a62248db4d56.tar.gz samba-df6d2db4ced5586320804950da58a62248db4d56.tar.bz2 samba-df6d2db4ced5586320804950da58a62248db4d56.zip | |
merge from old APP_HEAD
* remove corrupt tdb and shutdown (only for printing tdbs, connections,
sessionid & locking)
* decrement smbd counter in connections.tdb in smb_panic()
* various Makefile hack to get things to link
'max smbd processes' looks like it might be broken. The counter KEY is not
being set. Will look into that tomorrow.
(This used to be commit 6e22c5da929b6d9a4e32dc704c83112b2ad8fcfd)
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 4 | ||||
| -rw-r--r-- | source3/locking/locking.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index c51a5a2aac..47001c8b89 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -246,8 +246,8 @@ void brl_init(int read_only) { if (tdb) return; - tdb = tdb_open_log(lock_path("brlock.tdb"), 0, TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST), - read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644); + tdb = tdb_open_ex(lock_path("brlock.tdb"), 0, TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST), + read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644, smbd_tdb_log); if (!tdb) { DEBUG(0,("Failed to open byte range locking database\n")); return; diff --git a/source3/locking/locking.c b/source3/locking/locking.c index c3abd63818..42036cc70c 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_log(lock_path("locking.tdb"), + tdb = tdb_open_ex(lock_path("locking.tdb"), 0, TDB_DEFAULT|(read_only?0x0:TDB_CLEAR_IF_FIRST), read_only?O_RDONLY:O_RDWR|O_CREAT, - 0644); + 0644, smbd_tdb_log); if (!tdb) { DEBUG(0,("ERROR: Failed to initialise locking database\n")); |