From 45e61fcf61ed9863fbe2b116fe0763fc139bbe0d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 6 Jan 2012 17:19:54 +0100 Subject: s3: Add a "lock_order" argument to db_open This will be used to enforce a lock hierarchy between the databases. We have seen deadlocks between locking.tdb, brlock.tdb, serverid.tdb and notify*.tdb. These should be fixed by refusing a dbwrap_fetch_locked that does not follow a defined lock hierarchy. --- source3/printing/printer_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/printing/printer_list.c') diff --git a/source3/printing/printer_list.c b/source3/printing/printer_list.c index 4b76ca50f4..d9e8737660 100644 --- a/source3/printing/printer_list.c +++ b/source3/printing/printer_list.c @@ -40,7 +40,7 @@ static struct db_context *get_printer_list_db(void) } db = db_open(NULL, PL_DB_NAME(), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, - O_RDWR|O_CREAT, 0644); + O_RDWR|O_CREAT, 0644, DBWRAP_LOCK_ORDER_1); return db; } -- cgit