sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Allow winbind removal by matching delays to Samba3.pm

Browse Source 
When using winbindd with the ntvfs file server, the responses are faster than
they were in the past.  Therefore, set:
 posix:sharedelay = 100000
 posix:writetimeupdatedelay = 500000
to the values used in Samba3.pm to allow the tests to pass against the NTVFS
file server without the internal winbind.

This allows the internal winbind to be removed.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andrew Bartlett 2015-06-19 16:49:41 +12:00 committed by Jeremy Allison
parent fb63fd1dc4
commit 45b7992428
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
selftest/target/Samba4.pm
View File

@ -925,16 +925,16 @@ sub provision($$$$$$$$$$)
[tmp]
path = $ctx->{share}
read only = no
posix:sharedelay = 10000
posix:sharedelay = 100000
posix:oplocktimeout = 3
posix:writetimeupdatedelay = 50000
posix:writetimeupdatedelay = 500000
[xcopy_share]
path = $ctx->{share}
read only = no
posix:sharedelay = 10000
posix:sharedelay = 100000
posix:oplocktimeout = 3
posix:writetimeupdatedelay = 50000
posix:writetimeupdatedelay = 500000
create mask = 777
force create mode = 777
@ -949,16 +949,16 @@ sub provision($$$$$$$$$$)
[test1]
path = $ctx->{share}/test1
read only = no
posix:sharedelay = 10000
posix:sharedelay = 100000
posix:oplocktimeout = 3
posix:writetimeupdatedelay = 50000
posix:writetimeupdatedelay = 500000
[test2]
path = $ctx->{share}/test2
read only = no
posix:sharedelay = 10000
posix:sharedelay = 100000
posix:oplocktimeout = 3
posix:writetimeupdatedelay = 50000
posix:writetimeupdatedelay = 500000
[cifs]
path = $ctx->{share}/_ignore_cifs_

2
source4/selftest/tests.py
View File

@ -232,7 +232,7 @@ for t in nbt_tests:
plansmbtorture4testsuite(t, "ad_dc_ntvfs", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"")
# Tests against the NTVFS POSIX backend
ntvfsargs = ["--option=torture:sharedelay=10000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=50000"]
ntvfsargs = ["--option=torture:sharedelay=100000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=500000"]
smb2 = smbtorture4_testsuites("smb2.")
#The QFILEINFO-IPC test needs to be on ipc$