[SCM] Samba Shared Repository - branch master updated

[Rusty Russell]

The branch, master has been updated
       via  bc1c82e... 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.
      from  39d287e... s4-test: Expand DSSYNC test to be executed against all partitions

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bc1c82ea137e1bf6cb55139a666c56ebb2226b23
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jul 28 05:15:40 2010 -0700

    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.

-----------------------------------------------------------------------

Summary of changes:
 lib/tdb/common/check.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/check.c b/lib/tdb/common/check.c
index 6bbfd7d..2c64043 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;
 }


-- 
Samba Shared Repository