summaryrefslogtreecommitdiff
path: root/source4/lib/tdb/common/lock.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-09-24 03:43:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:49 -0500
commit5860aef9cd53da572bef1b86a62a3a5e86da84b0 (patch)
treeceef07b8fdd5763db9077d157351f5bc58a3d761 /source4/lib/tdb/common/lock.c
parent5a770bf72061e6b57f88e28fc585ff3c015ace49 (diff)
downloadsamba-5860aef9cd53da572bef1b86a62a3a5e86da84b0.tar.gz
samba-5860aef9cd53da572bef1b86a62a3a5e86da84b0.tar.bz2
samba-5860aef9cd53da572bef1b86a62a3a5e86da84b0.zip
r10465: separate out a read_only db from a read-only traversal to ensure we
don't end up doing a mmap read only (This used to be commit 294ccfd46a0c4e1af9365d028acdabec03c41ad3)
Diffstat (limited to 'source4/lib/tdb/common/lock.c')
-rw-r--r--source4/lib/tdb/common/lock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/tdb/common/lock.c b/source4/lib/tdb/common/lock.c
index 7a76bd3d9b..703cfe9dc5 100644
--- a/source4/lib/tdb/common/lock.c
+++ b/source4/lib/tdb/common/lock.c
@@ -46,7 +46,7 @@ int tdb_brlock_len(struct tdb_context *tdb, tdb_off_t offset,
return 0;
}
- if ((rw_type == F_WRLCK) && (tdb->read_only)) {
+ if ((rw_type == F_WRLCK) && (tdb->read_only || tdb->traverse_read)) {
tdb->ecode = TDB_ERR_RDONLY;
return -1;
}
@@ -161,7 +161,7 @@ int tdb_lockall(struct tdb_context *tdb)
u32 i;
/* There are no locks on read-only dbs */
- if (tdb->read_only)
+ if (tdb->read_only || tdb->traverse_read)
return TDB_ERRCODE(TDB_ERR_LOCK, -1);
for (i = 0; i < tdb->header.hash_size; i++)
if (tdb_lock(tdb, i, F_WRLCK))