svn commit: samba r4675 - in branches/SAMBA_4_0/source/torture/rpc: .

abartlet at samba.org abartlet at samba.org
Tue Jan 11 06:15:12 GMT 2005


Author: abartlet
Date: 2005-01-11 06:15:11 +0000 (Tue, 11 Jan 2005)
New Revision: 4675

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4675

Log:
Prevent global warming, and save tridge's sainity by short-cutting the
testsuite for all the different flag types.  (We really only need to
know if we are getting the session key crypto stuff right, and one
call can tell us that).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/rpc/samlogon.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samlogon.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-01-11 06:04:44 UTC (rev 4674)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-01-11 06:15:11 UTC (rev 4675)
@@ -1035,6 +1035,7 @@
 	const char *name;
 	BOOL expect_fail;
 } test_table[] = {
+	{test_lmv2_ntlmv2, "NTLMv2 and LMv2", False},
 	{test_lm, "LM", False},
 	{test_lm_ntlm, "LM and NTLM", False},
 	{test_lm_ntlm_both_broken, "LM and NTLM, both broken", False},
@@ -1042,7 +1043,6 @@
 	{test_ntlm_in_lm, "NTLM in LM", False},
 	{test_ntlm_in_both, "NTLM in both", False},
 	{test_ntlmv2, "NTLMv2", False},
-	{test_lmv2_ntlmv2, "NTLMv2 and LMv2", False},
 	{test_lmv2, "LMv2", False},
 	{test_ntlmv2_lmv2_broken, "NTLMv2 and LMv2, LMv2 broken", False},
 	{test_ntlmv2_ntlmv2_broken, "NTLMv2 and LMv2, NTLMv2 broken", False},
@@ -1065,7 +1065,8 @@
   try a netlogon SamLogon
 */
 static BOOL test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-			  struct creds_CredentialState *creds)
+			  struct creds_CredentialState *creds, 
+			  int n_subtests)
 {
 	int i, v, l, f;
 	BOOL ret = True;
@@ -1106,6 +1107,9 @@
 
 	for (f=0;f<ARRAY_SIZE(function_levels);f++) {
 		for (i=0; test_table[i].fn; i++) {
+			if (n_subtests && (i > n_subtests)) {
+				continue;
+			}
 			for (v=0;v<ARRAY_SIZE(validation_levels);v++) {
 				for (l=0;l<ARRAY_SIZE(logon_levels);l++) {
 					char *error_string = NULL;
@@ -1271,7 +1275,7 @@
 		ret = False;
 	}
 
-	if (!test_SamLogon(p, mem_ctx, creds)) {
+	if (!test_SamLogon(p, mem_ctx, creds, 0)) {
 		ret = False;
 	}
 
@@ -1287,7 +1291,7 @@
 			ret = False;
 		}
 		
-		if (!test_SamLogon(p, mem_ctx, creds)) {
+		if (!test_SamLogon(p, mem_ctx, creds, 1)) {
 			ret = False;
 		}
 	}



More information about the samba-cvs mailing list