diff options
| author | Volker Lendecke <vl@samba.org> | 2012-01-06 17:19:54 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2012-01-18 14:48:04 +0100 |
| commit | 45e61fcf61ed9863fbe2b116fe0763fc139bbe0d (patch) | |
| tree | 06ea9ead2285b4a671d102edb8824422f7325703 /source3/passdb | |
| parent | e75c436fe6a9ee44f6adc744b6269e99f4920431 (diff) | |
| download | samba-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/passdb')
| -rw-r--r-- | source3/passdb/account_pol.c | 5 | ||||
| -rw-r--r-- | source3/passdb/pdb_tdb.c | 9 | ||||
| -rw-r--r-- | source3/passdb/secrets.c | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c index a32d07517d..4cb185c494 100644 --- a/source3/passdb/account_pol.c +++ b/source3/passdb/account_pol.c @@ -220,12 +220,13 @@ bool init_account_policy(void) } db = db_open(NULL, state_path("account_policy.tdb"), 0, TDB_DEFAULT, - O_RDWR, 0600); + O_RDWR, 0600, DBWRAP_LOCK_ORDER_1); if (db == NULL) { /* the account policies files does not exist or open * failed, try to create a new one */ db = db_open(NULL, state_path("account_policy.tdb"), 0, - TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + TDB_DEFAULT, O_RDWR|O_CREAT, 0600, + DBWRAP_LOCK_ORDER_1); if (db == NULL) { DEBUG(0,("Failed to open account policy database\n")); return False; diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index 01c0def57f..a090fcd5bb 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -224,7 +224,8 @@ static bool tdbsam_convert_backup(const char *dbname, struct db_context **pp_db) * it to stay around after we return from here. */ tmp_db = db_open(NULL, tmp_fname, 0, - TDB_DEFAULT, O_CREAT|O_RDWR, 0600); + TDB_DEFAULT, O_CREAT|O_RDWR, 0600, + DBWRAP_LOCK_ORDER_1); if (tmp_db == NULL) { DEBUG(0, ("tdbsam_convert_backup: Failed to create backup TDB passwd " "[%s]\n", tmp_fname)); @@ -290,7 +291,8 @@ static bool tdbsam_convert_backup(const char *dbname, struct db_context **pp_db) /* re-open the converted TDB */ orig_db = db_open(NULL, dbname, 0, - TDB_DEFAULT, O_CREAT|O_RDWR, 0600); + TDB_DEFAULT, O_CREAT|O_RDWR, 0600, + DBWRAP_LOCK_ORDER_1); if (orig_db == NULL) { DEBUG(0, ("tdbsam_convert_backup: Failed to re-open " "converted passdb TDB [%s]\n", dbname)); @@ -440,7 +442,8 @@ static bool tdbsam_open( const char *name ) /* Try to open tdb passwd. Create a new one if necessary */ - db_sam = db_open(NULL, name, 0, TDB_DEFAULT, O_CREAT|O_RDWR, 0600); + db_sam = db_open(NULL, name, 0, TDB_DEFAULT, O_CREAT|O_RDWR, 0600, + DBWRAP_LOCK_ORDER_1); if (db_sam == NULL) { DEBUG(0, ("tdbsam_open: Failed to open/create TDB passwd " "[%s]\n", name)); diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index e40095d2af..bd6be353cd 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -75,7 +75,8 @@ bool secrets_init_path(const char *private_dir) } db_ctx = db_open(NULL, fname, 0, - TDB_DEFAULT, O_RDWR|O_CREAT, 0600); + TDB_DEFAULT, O_RDWR|O_CREAT, 0600, + DBWRAP_LOCK_ORDER_1); if (db_ctx == NULL) { DEBUG(0,("Failed to open %s\n", fname)); |