summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-27 20:38:36 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-27 20:38:36 +1100
commitc24b8cbe5351d2b192480ff8cbd02b3f048b8e8a (patch)
treeddd0b5764d2dba4e6a6ccedd3101a5486dbf01c1
parent4fc27c9969960dfef73ad80438d274e0f45e119e (diff)
parent2c9ee20f15ef0f55bf4e2516ba498cc6d9403b71 (diff)
downloadsamba-c24b8cbe5351d2b192480ff8cbd02b3f048b8e8a.tar.gz
samba-c24b8cbe5351d2b192480ff8cbd02b3f048b8e8a.tar.bz2
samba-c24b8cbe5351d2b192480ff8cbd02b3f048b8e8a.zip
Merge with metze's change for oplocks to be on by default
Andrew Bartlett Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local Conflicts: source/ntvfs/common/opendb_tdb.c (This used to be commit 7c7a1a2b1f69cb4623c8832b732e8a1343ebd109)
-rw-r--r--source4/selftest/target/Samba4.pm3
1 files changed, 0 insertions, 3 deletions
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 416a376f68..262c8035f6 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -577,9 +577,6 @@ sub provision($$$$$$)
gensec:require_pac = true
log level = $smbd_loglevel
- # this is a global option
- opendb:oplocks = yes
-
[tmp]
path = $tmpdir
read only = no