summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-12-04 17:02:49 +1100
committerAndrew Bartlett <abartlet@samba.org>2010-12-09 18:01:56 +1100
commit22d67758efd20e62d6050fd10c8b922db75747c9 (patch)
tree676db6ea531de77b3ecd7a9cf88db0bef111e269 /source4
parent54ee213fa5da6b138ab367b537c5e084edf35ff2 (diff)
downloadsamba-22d67758efd20e62d6050fd10c8b922db75747c9.tar.gz
samba-22d67758efd20e62d6050fd10c8b922db75747c9.tar.bz2
samba-22d67758efd20e62d6050fd10c8b922db75747c9.zip
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
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/client/tests/test_smbclient.sh4
-rw-r--r--source4/torture/rpc/netlogon.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index 2fd5b56ca0..66cc2d9d9c 100755
--- 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 b1739a015c..457d38e82d 100644
--- 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;
}