diff options
author | Stefan Metzmacher <metze@samba.org> | 2017-12-07 13:00:10 +0100 |
---|---|---|
committer | Ralph Boehme <slow@samba.org> | 2018-01-10 01:01:24 +0100 |
commit | b6d55eefa21c548f962a0c5f290eb23c219f3bff (patch) | |
tree | 206172737d35cb9fb9ec53c94938ad38262a7583 /source4/selftest/tests.py | |
parent | bb3944c6083456b1de4fd88fda8b8186106687d5 (diff) | |
download | samba-b6d55eefa21c548f962a0c5f290eb23c219f3bff.tar.gz |
s4:selftest: replace --option=usespnego= with --option=clientusespnego=
I guess that's what we try to test here, as 'use spnego' was only evaluated
on in the smb server part.
The basically tests the 'raw NTLMv2 auth' option, we set it to yes on
some environments, but keep a knownfail for the ad_member.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source4/selftest/tests.py')
-rwxr-xr-x | source4/selftest/tests.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 91f8a5cec68..73bdce61873 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -219,18 +219,18 @@ for t in net_tests: transport = "ncacn_np" for env in ["ad_dc_ntvfs", "nt4_dc"]: for ntlmoptions in [ - "-k no --option=usespnego=yes", - "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no", - "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=yes", - "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=no", - "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", - "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=no", - "-k no --option=usespnego=yes --option=clientntlmv2auth=yes", - "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no", - "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", - "-k no --option=usespnego=no --option=clientntlmv2auth=yes", + "-k no --option=clientusespnego=yes", + "-k no --option=clientusespnego=yes --option=ntlmssp_client:128bit=no", + "-k no --option=clientusespnego=yes --option=ntlmssp_client:56bit=yes", + "-k no --option=clientusespnego=yes --option=ntlmssp_client:56bit=no", + "-k no --option=clientusespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", + "-k no --option=clientusespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=no", + "-k no --option=clientusespnego=yes --option=clientntlmv2auth=yes", + "-k no --option=clientusespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no", + "-k no --option=clientusespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", + "-k no --option=clientusespnego=no --option=clientntlmv2auth=yes", "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes", - "-k no --option=usespnego=no"]: + "-k no --option=clientusespnego=no"]: name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions) plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.%s" % name) plantestsuite("samba.blackbox.pdbtest(%s)" % env, "%s:local" % env, [os.path.join(bbdir, "test_pdbtest.sh"), '$SERVER', "$PREFIX", "pdbtest", smbclient4, '$SMB_CONF_PATH', configuration]) @@ -452,7 +452,7 @@ plansmbtorture4testsuite("rpc.echo", "rpc_proxy", ['ncacn_ip_tcp:$NETBIOSNAME', # Tests SMB signing for mech in [ "-k no", - "-k no --option=usespnego=no", + "-k no --option=clientusespnego=no", "-k no --option=gensec:spengo=no", "-k yes", "-k yes --option=gensec:fake_gssapi_krb5=yes --option=gensec:gssapi_krb5=no"]: @@ -463,7 +463,7 @@ for mech in [ for mech in [ "-k no", - "-k no --option=usespnego=no", + "-k no --option=clientusespnego=no", "-k no --option=gensec:spengo=no", "-k yes"]: signoptions = "%s --signing=off" % mech @@ -477,7 +477,7 @@ for mech in [ plantestsuite("samba4.blackbox.bogusdomain", "ad_member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient4]) for mech in [ "-k no", - "-k no --option=usespnego=no", + "-k no --option=clientusespnego=no", "-k no --option=gensec:spengo=no"]: signoptions = "%s --signing=off" % mech plansmbtorture4testsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], modname="samba4.smb.signing on with %s local-creds" % signoptions) |