The branch, v4-2-test has been updated
via 4701d74 tdb_wrap: Make mutexes easier to use
from c6dc67a nss_wrapper: check for nss.h
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test
- Log -----------------------------------------------------------------
commit 4701d74618c639acec895850c4720d53f29dece5
Author: Volker Lendecke <v...@samba.org>
Date: Tue Sep 30 11:04:21 2014 +0000
tdb_wrap: Make mutexes easier to use
This patch makes sure we work fine and open without mutexes if they
are not supported.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
(cherry picked from commit 911439639a2caa17a9680cb297e9fe26eba56149)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11032
Autobuild-User(v4-2-test): Karolin Seeger <ksee...@samba.org>
Autobuild-Date(v4-2-test): Mon Jan 12 22:28:31 CET 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/tdb_wrap/tdb_wrap.c | 7 +++++++
1 file changed, 7 insertions(+)
Changeset truncated at 500 lines:
diff --git a/lib/tdb_wrap/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c
index f2f32d1..e762b33 100644
--- a/lib/tdb_wrap/tdb_wrap.c
+++ b/lib/tdb_wrap/tdb_wrap.c
@@ -149,6 +149,13 @@ struct tdb_wrap *tdb_wrap_open(TALLOC_CTX *mem_ctx,
}
if (w == NULL) {
+
+ if (tdb_flags & TDB_MUTEX_LOCKING) {
+ if (!tdb_runtime_check_for_robust_mutexes()) {
+ tdb_flags &= ~TDB_MUTEX_LOCKING;
+ }
+ }
+
w = tdb_wrap_private_open(result, name, hash_size, tdb_flags,
open_flags, mode);
} else {
--
Samba Shared Repository
