diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:42:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:42:13 +0930 |
| commit | 997592431f3e62cacef13d9b75a12a3d8058e7b7 (patch) | |
| tree | a0941636f9ad0c72fc5a774b7031bbb8a3f3e4fd /lib/tdb2/tdb1_transaction.c | |
| parent | f7e84f8ef86c3323f70e2fa30fd8a49cab1febf9 (diff) | |
| download | samba-997592431f3e62cacef13d9b75a12a3d8058e7b7.tar.gz samba-997592431f3e62cacef13d9b75a12a3d8058e7b7.tar.bz2 samba-997592431f3e62cacef13d9b75a12a3d8058e7b7.zip | |
tdb2: use tdb->flags & TDB_RDONLY instead of tdb->read_only for TDB1 code.
There's also a semantic change here: for tdb1, being read-only meant no
locking, and it was an error to try to lock a r/o database. For TDB2, you'd
need to specify TDB_NOLOCK, which suppresses locking silently.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 4dc29a338fadeac805b369b4b0851c02f1b152c7)
Diffstat (limited to 'lib/tdb2/tdb1_transaction.c')
| -rw-r--r-- | lib/tdb2/tdb1_transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tdb2/tdb1_transaction.c b/lib/tdb2/tdb1_transaction.c index f0623025f9..cf77a35996 100644 --- a/lib/tdb2/tdb1_transaction.c +++ b/lib/tdb2/tdb1_transaction.c @@ -418,7 +418,7 @@ static const struct tdb1_methods transaction1_methods = { static int _tdb1_transaction_start(struct tdb1_context *tdb) { /* some sanity checks */ - if (tdb->read_only || (tdb->flags & TDB_INTERNAL) || tdb->traverse_read) { + if ((tdb->flags & TDB_RDONLY) || (tdb->flags & TDB_INTERNAL) || tdb->traverse_read) { tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR, "tdb1_transaction_start: cannot start a" " transaction on a read-only or" @@ -1198,7 +1198,7 @@ int tdb1_transaction_recover(struct tdb1_context *tdb) return 0; } - if (tdb->read_only) { + if (tdb->flags & TDB_RDONLY) { tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR, "tdb1_transaction_recover:" " attempt to recover read only" |