diff options
| author | Gerald Carter <jerry@samba.org> | 2004-06-04 17:26:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:53 -0500 |
| commit | 386a11f49eff2ec60d75b9966ecdc5627b259f0d (patch) | |
| tree | 2cc5604ce524425236761867800bdb8c162ecf26 /source3/smbd | |
| parent | 596eacea722d6b66cf0a7556e20545c77ee0b8e7 (diff) | |
| download | samba-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/smbd')
| -rw-r--r-- | source3/smbd/connection.c | 8 | ||||
| -rw-r--r-- | source3/smbd/session.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c index a9ab142461..5bb76eb3bd 100644 --- a/source3/smbd/connection.c +++ b/source3/smbd/connection.c @@ -29,8 +29,8 @@ static TDB_CONTEXT *tdb; TDB_CONTEXT *conn_tdb_ctx(void) { if (!tdb) - tdb = tdb_open_ex(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, - O_RDWR | O_CREAT, 0644, smbd_tdb_log); + tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, + O_RDWR | O_CREAT, 0644); return tdb; } @@ -131,8 +131,8 @@ BOOL claim_connection(connection_struct *conn, const char *name,int max_connecti TDB_DATA kbuf, dbuf; if (!tdb) - tdb = tdb_open_ex(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, - O_RDWR | O_CREAT, 0644, smbd_tdb_log); + tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, + O_RDWR | O_CREAT, 0644); if (!tdb) return False; diff --git a/source3/smbd/session.c b/source3/smbd/session.c index 61118f13dd..91ebaeb830 100644 --- a/source3/smbd/session.c +++ b/source3/smbd/session.c @@ -34,8 +34,8 @@ BOOL session_init(void) if (tdb) return True; - tdb = tdb_open_ex(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, - O_RDWR | O_CREAT, 0644, smbd_tdb_log); + tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, + O_RDWR | O_CREAT, 0644); if (!tdb) { DEBUG(1,("session_init: failed to open sessionid tdb\n")); return False; |