summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-01-06 17:19:54 +0100
committerVolker Lendecke <vlendec@samba.org>2012-01-18 14:48:04 +0100
commit45e61fcf61ed9863fbe2b116fe0763fc139bbe0d (patch)
tree06ea9ead2285b4a671d102edb8824422f7325703 /source3/printing
parente75c436fe6a9ee44f6adc744b6269e99f4920431 (diff)
downloadsamba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.gz
samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.bz2
samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.zip
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.
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/printer_list.c2
1 files changed, 1 insertions, 1 deletions
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;
}