summaryrefslogtreecommitdiff
path: root/source4/selftest/target/Samba4.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-26 13:07:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-26 13:07:55 +0100
commita999a1fc996234555bd2d8a4a873b39d111c347e (patch)
tree737b0bf68f6a93d6e835676b96b8bb3c606d1c91 /source4/selftest/target/Samba4.pm
parent227df641f680d844c85ea0ed1694e41ed355e262 (diff)
parent901addd4a18a9a166fc3518a7bce70969f884e6f (diff)
downloadsamba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.gz
samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.bz2
samba-a999a1fc996234555bd2d8a4a873b39d111c347e.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4dab354b626a02e9a5f5cac0d374d18e22718e18)
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