From be704c87650d85159c054b03fc94e2eee1eab17e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 16 Jan 2016 10:20:32 +0100 Subject: [PATCH] selftest: add dbwrap_tdb_require_mutexes:* = yes, when using dbwrap_tdb_mutexes:* = yes by default MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit export SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT=1 can overwrite this. Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Tue Feb 9 01:42:14 CET 2016 on sn-devel-144 --- selftest/target/Samba3.pm | 4 ++++ selftest/target/Samba4.pm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 076bcb166f1..cb9ee08d822 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -308,10 +308,14 @@ sub setup_nt4_member($$$) print "PROVISIONING MEMBER..."; + my $require_mutexes = "dbwrap_tdb_require_mutexes:* = yes"; + $require_mutexes = "" if ($ENV{SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT} eq "1"); + my $member_options = " security = domain server signing = on dbwrap_tdb_mutexes:* = yes + ${require_mutexes} "; my $ret = $self->provision($prefix, "LOCALNT4MEMBER3", diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index fbefda7fb64..2343cec186d 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1794,11 +1794,15 @@ sub provision_ad_dc($$) my $lockdir="$prefix_abs/lockdir"; my $conffile="$prefix_abs/etc/smb.conf"; + my $require_mutexes = "dbwrap_tdb_require_mutexes:* = yes"; + $require_mutexes = "" if ($ENV{SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT} eq "1"); + my $extra_smbconf_options = " server services = -smb +s3fs xattr_tdb:file = $prefix_abs/statedir/xattr.tdb dbwrap_tdb_mutexes:* = yes + ${require_mutexes} kernel oplocks = no kernel change notify = no -- 2.47.3