s4-tests Workaround new default of 'client ntlmv2 auth = yes' in tests

The new default breaks some tests that were assuming LM or NTLM auth

Andrew Bartlett
(cherry picked from commit 22d67758efd20e62d6050fd10c8b922db75747c9)

diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index 2fd5b56ca0336ccc86f4d487936bf45620cced18..66cc2d9d9c4858dae68170f5f34bfb59b3e5e4e8 100755 (executable)
--- a/source4/client/tests/test_smbclient.sh
+++ b/source4/client/tests/test_smbclient.sh
@@ -116,8 +116,8 @@ runcmd "Lookup name" "lookup $DOMAIN\\$USERNAME" || failed=`expr $failed + 1`
 #runcmd "Lookup privs of name" "privileges $DOMAIN\\$USERNAME" || failed=`expr $failed + 1`
 
 # do some simple operations using old protocol versions
-runcmd "List directory with LANMAN1" 'ls' -m LANMAN1 || failed=`expr $failed + 1`
-runcmd "List directory with LANMAN2" 'ls' -m LANMAN2 || failed=`expr $failed + 1`
+runcmd "List directory with LANMAN1" 'ls' -m LANMAN1 --option=clientntlmv2auth=no || failed=`expr $failed + 1`
+runcmd "List directory with LANMAN2" 'ls' -m LANMAN2 --option=clientntlmv2auth=no || failed=`expr $failed + 1`
 
 runcmd "Print current working directory" 'pwd'|| failed=`expr $failed + 1`
 

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 4d48cc25a7585c8e63e510abfd28873ddbc7745e..c9fda65a398bd218b519bd073fe70501f28c6c7e 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -702,7 +702,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
                flags |= CLI_CRED_LANMAN_AUTH;
        }
 
-       if (lpcfg_client_ntlmv2_auth(tctx->lp_ctx)) {
+       if (lpcfg_client_ntlmv2_auth(tctx->lp_ctx) && !null_domain) {
                flags |= CLI_CRED_NTLMv2_AUTH;
        }