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

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-13 06:42:36 +0000 (Mon, 13 Jun 2005)
New Revision: 7521

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

Log:
Remove useless loops from SAMLOGON test, which speeds it up a lot.

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-06-13 06:07:18 UTC (rev 7520)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-06-13 06:42:36 UTC (rev 7521)
@@ -1377,6 +1377,7 @@
 		goto failed;
 	}
 
+	/* Try all the tests for different username forms */
 	for (ci = 0; ci < ARRAY_SIZE(usercreds); ci++) {
 		
 		if (!test_InteractiveLogon(p, mem_ctx, creds,
@@ -1397,26 +1398,26 @@
 		}
 	}
 
+	/* Using the first username form, try the different
+	 * credentials flag setups, on only one of the tests (checks
+	 * session key encryption) */
+
 	for (i=0; i < ARRAY_SIZE(credential_flags); i++) {
+		if (!test_InteractiveLogon(p, mem_ctx, creds,
+					   usercreds[0].domain,
+					   usercreds[0].username,
+					   usercreds[0].password)) {
+			ret = False;
+		}
 		
-		for (ci = 0; ci < ARRAY_SIZE(usercreds); ci++) {
-			
-			if (!test_InteractiveLogon(p, mem_ctx, creds,
-						   usercreds[ci].domain,
-						   usercreds[ci].username,
-						   usercreds[ci].password)) {
+		if (usercreds[ci].network_login) {
+			if (!test_SamLogon(p, mem_ctx, creds, 
+					   usercreds[0].domain,
+					   usercreds[0].username,
+					   usercreds[0].password,
+					   1)) {
 				ret = False;
 			}
-			
-			if (usercreds[ci].network_login) {
-				if (!test_SamLogon(p, mem_ctx, creds, 
-						   usercreds[ci].domain,
-						   usercreds[ci].username,
-						   usercreds[ci].password,
-						   1)) {
-					ret = False;
-				}
-			}
 		}
 	}