s4-netlogon: merge netr_ServerAuthenticate{2,3} from s3 idl.

Guenther

3 files changed, 7 insertions, 7 deletions

diff --git a/source4/torture/ndr/netlogon.c b/source4/torture/ndr/netlogon.c
index a5221f71e9..f437fa0deb 100644
--- a/source4/torture/ndr/netlogon.c
+++ b/source4/torture/ndr/netlogon.c
@@ -59,7 +59,7 @@ static bool netrserverauthenticate3_out_check(struct torture_context *tctx,
 											struct netr_ServerAuthenticate3 *r)
 {
 	uint8_t cred_expected[8] = { 0x22, 0x0c, 0x86, 0x8a, 0xe9, 0x92, 0x93, 0xc9 };
-	torture_assert_mem_equal(tctx, cred_expected, r->out.credentials->data, 8, "credentials");
+	torture_assert_mem_equal(tctx, cred_expected, r->out.return_credentials->data, 8, "return_credentials");
 	torture_assert_int_equal(tctx, *r->out.negotiate_flags, 0x6007ffff, "negotiate flags");
 	torture_assert_int_equal(tctx, *r->out.rid, 0x454, "rid");
 	torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 174022248d..44d92eb121 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -108,7 +108,7 @@ static bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context
 	a.in.secure_channel_type = SEC_CHAN_BDC;
 	a.in.computer_name = machine_name;
 	a.in.credentials = &credentials3;
-	a.out.credentials = &credentials3;
+	a.out.return_credentials = &credentials3;
 
 	creds_client_init(creds, &credentials1, &credentials2, 
 			  mach_password, &credentials3, 
@@ -173,7 +173,7 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
 	a.in.negotiate_flags = &negotiate_flags;
 	a.out.negotiate_flags = &negotiate_flags;
 	a.in.credentials = &credentials3;
-	a.out.credentials = &credentials3;
+	a.out.return_credentials = &credentials3;
 
 	creds_client_init(creds, &credentials1, &credentials2, 
 			  mach_password, &credentials3, 
@@ -235,7 +235,7 @@ static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context
 	a.in.computer_name = machine_name;
 	a.in.negotiate_flags = &negotiate_flags;
 	a.in.credentials = &credentials3;
-	a.out.credentials = &credentials3;
+	a.out.return_credentials = &credentials3;
 	a.out.negotiate_flags = &negotiate_flags;
 	a.out.rid = &rid;
 
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 5f8225cb33..220bc02351 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -946,7 +946,7 @@ static bool auth2(struct smbcli_state *cli,
 	a.in.negotiate_flags = &negotiate_flags;
 	a.out.negotiate_flags = &negotiate_flags;
 	a.in.credentials = &netr_cred;
-	a.out.credentials = &netr_cred;
+	a.out.return_credentials = &netr_cred;
 
 	status = dcerpc_netr_ServerAuthenticate2(net_pipe, mem_ctx, &a);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -955,7 +955,7 @@ static bool auth2(struct smbcli_state *cli,
 		goto done;
 	}
 
-	if (!creds_client_check(creds_state, a.out.credentials)) {
+	if (!creds_client_check(creds_state, a.out.return_credentials)) {
 		d_printf("creds_client_check failed\n");
 		goto done;
 	}
@@ -2081,7 +2081,7 @@ bool torture_samba3_rpc_randomauth2(struct torture_context *torture)
 	a.in.negotiate_flags = &negotiate_flags;
 	a.out.negotiate_flags = &negotiate_flags;
 	a.in.credentials = &netr_cred;
-	a.out.credentials = &netr_cred;
+	a.out.return_credentials = &netr_cred;
 
 	status = dcerpc_netr_ServerAuthenticate2(net_pipe, mem_ctx, &a);