summaryrefslogtreecommitdiff
path: root/source4/selftest/target/Samba4.pm
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-02-28 10:33:54 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-02-28 10:33:54 +1100
commitb33873ae5d13993030f41f5304d78640fe07d25c (patch)
treeb4d6dfd9833b603b16474b0d5ab7918474c7a8bd /source4/selftest/target/Samba4.pm
parent17207133ea446670e2123b510a593456928882fb (diff)
parent6dec6fbfaddf74c4567e83b354590cfbe3d6d0a9 (diff)
downloadsamba-b33873ae5d13993030f41f5304d78640fe07d25c.tar.gz
samba-b33873ae5d13993030f41f5304d78640fe07d25c.tar.bz2
samba-b33873ae5d13993030f41f5304d78640fe07d25c.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit ba864cfd7ce4b69179431131cac9661cbf48bf32)
Diffstat (limited to 'source4/selftest/target/Samba4.pm')
-rw-r--r--source4/selftest/target/Samba4.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 37e3cbe354..e0be8048a0 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -562,12 +562,16 @@ sub provision($$$$$$)
gensec:require_pac = true
log level = $smbd_loglevel
+ # this is a global option
+ opendb:oplocks = yes
+
[tmp]
path = $tmpdir
read only = no
ntvfs handler = posix
posix:sharedelay = 100000
posix:eadb = $lockdir/eadb.tdb
+ posix:oplocktimeout = 3
[test1]
path = $tmpdir/test1
@@ -575,6 +579,7 @@ sub provision($$$$$$)
ntvfs handler = posix
posix:sharedelay = 100000
posix:eadb = $lockdir/eadb.tdb
+ posix:oplocktimeout = 3
[test2]
path = $tmpdir/test2
@@ -582,6 +587,7 @@ sub provision($$$$$$)
ntvfs handler = posix
posix:sharedelay = 100000
posix:eadb = $lockdir/eadb.tdb
+ posix:oplocktimeout = 3
[cifs]
read only = no