selftest: enable 'server multi channel support = yes'

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14534

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index 6c005d1f4deb7afc6db6269b44e5d59870d5710a..6a760d6c6e08f05ae97e0b35d46ffb2f8813760b 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -213,14 +213,10 @@
 ^samba3.smb2.session.*reauth5 # some special anonymous checks?
 ^samba3.smb2.compound.interim2 # wrong return code (STATUS_CANCELLED)
 ^samba3.smb2.compound.aio.interim2 # wrong return code (STATUS_CANCELLED)
-^samba3.smb2.replay.replay3 # This requires multi-chanel
-^samba3.smb2.replay.replay4 # This requires multi-chanel
-^samba3.smb2.lock.replay_smb3_specification_multi # This requires multi-chanel
 ^samba3.smb2.lock.replay_smb3_specification_durable\(nt4_dc\) # Requires durable handles
 ^samba3.smb2.lock.*replay_broken_windows # This tests the windows behaviour
 ^samba3.smb2.lease.statopen3
 ^samba3.smb2.lease.unlink # we currently do not downgrade RH lease to R after unlink
-^samba3.smb2.multichannel
 ^samba4.smb2.ioctl.compress_notsup.*\(ad_dc_ntvfs\)
 ^samba3.raw.session.*reauth2 # maybe fix this?
 ^samba3.rpc.lsa.secrets.seal # This gives NT_STATUS_LOCAL_USER_SESSION_KEY

diff --git a/selftest/knownfail.d/multichannel b/selftest/knownfail.d/multichannel
new file mode 100644 (file)
index 0000000..6c91b55
--- /dev/null
+++ b/selftest/knownfail.d/multichannel
@@ -0,0 +1,7 @@
+^samba3.smb2.multichannel.oplocks.test2.nt4_dc              # expects windows behavior => smb2 disable oplock break retry = yes
+^samba3.smb2.multichannel.oplocks.test3_windows.nt4_dc      # expects windows behavior => smb2 disable oplock break retry = yes
+^samba3.smb2.multichannel.oplocks.test3_specification.ad_dc # expects samba (MS-SMB2) behavior
+^samba3.smb2.multichannel.leases.test1.ad_dc                # requires lease support
+^samba3.smb2.multichannel.leases.test2.ad_dc                # requires lease support
+^samba3.smb2.multichannel.leases.test3.ad_dc                # requires lease support
+^samba3.smb2.multichannel.leases.test4.ad_dc                # requires lease support

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3a739d6e4a603dbb47655b72ffae68a0e94cbc5e..a0c43aa842e4b2de1adea7f26d92d37a8c2b4d5f 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -2284,6 +2284,8 @@ sub provision($$)
        client min protocol = SMB2_02
        server min protocol = SMB2_02
 
+       server multi channel support = yes
+
        workgroup = $domain
 
        private dir = $privatedir

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index dff9d042be93a74e0d7180147950fffb8b6069a8..61e9eb614221808be789b9dbc1713e3760c4cbe3 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -763,6 +763,8 @@ sub provision_raw_step1($$)
        tls crlfile = ${crlfile}
        tls verify peer = no_check
        panic action = $RealBin/gdb_backtrace \%d
+       smbd:suicide mode = yes
+       smbd:FSCTL_SMBTORTURE = yes
        wins support = yes
        server role = $ctx->{server_role}
        server services = +echo $services
@@ -1905,6 +1907,8 @@ sub provision_ad_dc($$$$$$$)
        kernel oplocks = no
        kernel change notify = no
        smb2 leases = no
+       smb2 disable oplock break retry = yes
+       server multi channel support = yes
 
        logging = file
        printing = bsd