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_tdb.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_tdb.c')
| -rw-r--r-- | lib/tdb2/tdb1_tdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tdb2/tdb1_tdb.c b/lib/tdb2/tdb1_tdb.c index 8392e71240..827b4fcf09 100644 --- a/lib/tdb2/tdb1_tdb.c +++ b/lib/tdb2/tdb1_tdb.c @@ -283,7 +283,7 @@ int tdb1_do_delete(struct tdb1_context *tdb, tdb1_off_t rec_ptr, struct tdb1_rec tdb1_off_t last_ptr, i; struct tdb1_record lastrec; - if (tdb->read_only || tdb->traverse_read) return -1; + if ((tdb->flags & TDB_RDONLY) || tdb->traverse_read) return -1; if (((tdb->traverse_write != 0) && (!TDB1_DEAD(rec))) || tdb1_write_lock_record(tdb, rec_ptr) == -1) { @@ -601,7 +601,7 @@ int tdb1_store(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag) uint32_t hash; int ret; - if (tdb->read_only || tdb->traverse_read) { + if ((tdb->flags & TDB_RDONLY) || tdb->traverse_read) { tdb->last_error = TDB_ERR_RDONLY; return -1; } |