Commit 386a11f4 authored by Gerald Carter's avatar Gerald Carter Committed by Gerald (Jerry) Carter
Browse files

r1011: fix bad merge (from a few months ago) and ensure that we always use... 

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)
parent 596eacea

source3/locking/brlock.c

+2 −2
Original line number Diff line number Diff line
@@ -246,8 +246,8 @@ void brl_init(int read_only) 
{

	if (tdb)

		return;

	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);

	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 );

	if (!tdb) {

		DEBUG(0,("Failed to open byte range locking database\n"));

		return;

source3/locking/locking.c

+2 −2
Original line number Diff line number Diff line
@@ -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"));

source3/printing/printing_db.c

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ struct tdb_print_db *get_print_db_byname(const char *printername) 
		done_become_root = True;

	}



	p->tdb = tdb_open_ex(printdb_path, 5000, TDB_DEFAULT, O_RDWR|O_CREAT, 

		0600, smbd_tdb_log);

	p->tdb = tdb_open_log(printdb_path, 5000, TDB_DEFAULT, O_RDWR|O_CREAT, 

		0600);



	if (done_become_root)

		unbecome_root();

source3/smbd/connection.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

source3/smbd/session.c

+2 −2
Original line number Diff line number Diff line
@@ -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;