From: Jeremy Allison Date: Wed, 28 Jul 2010 12:15:40 +0000 (-0700) Subject: Fix tdb_check() to work with read-only tdb databases. The function tdb_lockall()... X-Git-Tag: samba-4.0.0alpha13~1683 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=bc1c82ea137e1bf6cb55139a666c56ebb2226b23 Fix tdb_check() to work with read-only tdb databases. The function tdb_lockall() uses F_WRLCK internally, which doesn't work on a fd opened with O_RDONLY. Use tdb_lockall_read() instead. Jeremy. --- diff --git a/lib/tdb/common/check.c b/lib/tdb/common/check.c index 6bbfd7d82ac..2c640434ee4 100644 --- a/lib/tdb/common/check.c +++ b/lib/tdb/common/check.c @@ -311,7 +311,7 @@ int tdb_check(struct tdb_context *tdb, struct tdb_record rec; bool found_recovery = false; - if (tdb_lockall(tdb) == -1) + if (tdb_lockall_read(tdb) == -1) return -1; /* Make sure we know true size of the underlying file. */ @@ -412,12 +412,12 @@ int tdb_check(struct tdb_context *tdb, } free(hashes); - tdb_unlockall(tdb); + tdb_unlockall_read(tdb); return 0; free: free(hashes); unlock: - tdb_unlockall(tdb); + tdb_unlockall_read(tdb); return -1; }