summaryrefslogtreecommitdiff
path: root/source4/selftest/target/Samba4.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-27 16:03:00 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-27 16:03:00 +0100
commit48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a (patch)
treef204e65c0ab980834f314d13ce6b32721c8b7f66 /source4/selftest/target/Samba4.pm
parent3101cb888d5cbad785050b8491b138d683d444fb (diff)
parentb42e3fb232ca68e869de4b39826da861f48e6771 (diff)
downloadsamba-48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a.tar.gz
samba-48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a.tar.bz2
samba-48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit d96fcc52a70fd1236b767b1d88a39d78c4e8c48c)
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