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

[abartlet at samba.org]

Author: abartlet
Date: 2005-01-09 07:39:31 +0000 (Sun, 09 Jan 2005)
New Revision: 4614

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

Log:
Fix RPC-SAMLOGON, to use the workstation context (forgot to globally replace).

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/netlogon.c	2005-01-09 05:31:59 UTC (rev 4613)
+++ branches/SAMBA_4_0/source/torture/rpc/netlogon.c	2005-01-09 07:39:31 UTC (rev 4614)
@@ -130,6 +130,7 @@
 			    uint32_t negotiate_flags,
 			    const char *machine_name,
 			    const char *plain_pass,
+			    int sec_chan_type,
 			    struct creds_CredentialState *creds)
 {
 	NTSTATUS status;
@@ -157,7 +158,7 @@
 
 	a.in.server_name = NULL;
 	a.in.account_name = talloc_asprintf(mem_ctx, "%s$", machine_name);
-	a.in.secure_channel_type = SEC_CHAN_BDC;
+	a.in.secure_channel_type = sec_chan_type;
 	a.in.computer_name = machine_name;
 	a.in.negotiate_flags = &negotiate_flags;
 	a.out.negotiate_flags = &negotiate_flags;
@@ -761,7 +762,8 @@
 	BOOL ret = True;
 
 	if (!test_SetupCredentials2(p, mem_ctx, NETLOGON_NEG_AUTH2_FLAGS, 
-				    TEST_MACHINE_NAME, machine_password, &creds)) {
+				    TEST_MACHINE_NAME, machine_password, 
+				    SEC_CHAN_BDC, &creds)) {
 		return False;
 	}
 

Modified: branches/SAMBA_4_0/source/torture/rpc/samlogon.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-01-09 05:31:59 UTC (rev 4613)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-01-09 07:39:31 UTC (rev 4614)
@@ -1232,7 +1232,7 @@
 	join_ctx = torture_join_domain(TEST_MACHINE_NAME, lp_workgroup(), ACB_WSTRUST, 
 				       &machine_password);
 	if (!join_ctx) {
-		printf("Failed to join as BDC\n");
+		printf("Failed to join as Workstation\n");
 		return False;
 	}
 
@@ -1247,7 +1247,7 @@
 	 * with INTERNAL_ERROR */
 
 	b.flags &= ~DCERPC_AUTH_OPTIONS;
-	b.flags |= DCERPC_SCHANNEL_BDC | DCERPC_SIGN | DCERPC_SCHANNEL_128;
+	b.flags |= DCERPC_SCHANNEL_WORKSTATION | DCERPC_SIGN | DCERPC_SCHANNEL_128;
 
 	status = dcerpc_pipe_connect_b(&p, &b, 
 				       DCERPC_NETLOGON_UUID,
@@ -1278,7 +1278,8 @@
 	for (i=0; i < ARRAY_SIZE(credential_flags); i++) {
 		
 		if (!test_SetupCredentials2(p, mem_ctx, credential_flags[i],
-					    TEST_MACHINE_NAME, machine_password, creds)) {
+					    TEST_MACHINE_NAME, machine_password, 
+					    SEC_CHAN_WKSTA, creds)) {
 			return False;
 		}