s4-netlogon: merge netr_ServerReqChallenge from s3 idl.

Guenther

6 files changed, 13 insertions, 12 deletions

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 9f6c1e756e..3b618f1cc3 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -316,7 +316,8 @@ interface netlogon
 	[public] NTSTATUS netr_ServerReqChallenge(
 		[in,unique,string,charset(UTF16)] uint16 *server_name,
 		[in,string,charset(UTF16)] uint16 computer_name[],
-		[in,out,ref] netr_Credential *credentials
+		[in,ref] netr_Credential *credentials,
+		[out,ref] netr_Credential *return_credentials
 		);
 
 
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index 35adc8b42e..13bbc3d51f 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -132,7 +132,7 @@ static void continue_bind_auth_none(struct composite_context *ctx)
 	if (composite_nomem(s->r.in.server_name, c)) return;
 	s->r.in.computer_name = cli_credentials_get_workstation(s->credentials);
 	s->r.in.credentials   = &s->credentials1;
-	s->r.out.credentials  = &s->credentials2;
+	s->r.out.return_credentials  = &s->credentials2;
 	
 	generate_random_buffer(s->credentials1.data, sizeof(s->credentials1.data));
 
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index a022ddf576..8dc11a6f6a 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -49,7 +49,7 @@ static NTSTATUS dcesrv_netr_ServerReqChallenge(struct dcesrv_call_state *dce_cal
 {
 	struct server_pipe_state *pipe_state = dce_call->context->private;
 
-	ZERO_STRUCTP(r->out.credentials);
+	ZERO_STRUCTP(r->out.return_credentials);
 
 	/* destroyed on pipe shutdown */
 
@@ -66,7 +66,7 @@ static NTSTATUS dcesrv_netr_ServerReqChallenge(struct dcesrv_call_state *dce_cal
 	generate_random_buffer(pipe_state->server_challenge.data, 
 			       sizeof(pipe_state->server_challenge.data));
 
-	*r->out.credentials = pipe_state->server_challenge;
+	*r->out.return_credentials = pipe_state->server_challenge;
 
 	dce_call->context->private = pipe_state;
 
diff --git a/source4/torture/ndr/netlogon.c b/source4/torture/ndr/netlogon.c
index f437fa0deb..ea11a20bb2 100644
--- a/source4/torture/ndr/netlogon.c
+++ b/source4/torture/ndr/netlogon.c
@@ -98,7 +98,7 @@ static bool netrserverreqchallenge_out_check(struct torture_context *tctx,
 					     struct netr_ServerReqChallenge *r)
 {
 	uint8_t cred_expected[8] = { 0x22, 0xfc, 0xc1, 0x17, 0xc0, 0xae, 0x27, 0x8e };
-	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_ntstatus_ok(tctx, r->out.result, "return code");
 
 	return true;
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 44d92eb121..6da3eaf79d 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -96,7 +96,7 @@ static bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context
 	r.in.server_name = NULL;
 	r.in.computer_name = machine_name;
 	r.in.credentials = &credentials1;
-	r.out.credentials = &credentials2;
+	r.out.return_credentials = &credentials2;
 
 	generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
@@ -159,7 +159,7 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
 	r.in.server_name = NULL;
 	r.in.computer_name = machine_name;
 	r.in.credentials = &credentials1;
-	r.out.credentials = &credentials2;
+	r.out.return_credentials = &credentials2;
 
 	generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
@@ -220,7 +220,7 @@ static bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context
 	r.in.server_name = NULL;
 	r.in.computer_name = machine_name;
 	r.in.credentials = &credentials1;
-	r.out.credentials = &credentials2;
+	r.out.return_credentials = &credentials2;
 
 	generate_random_buffer(credentials1.data, sizeof(credentials1.data));
 
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 220bc02351..f8b6da96a8 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -920,7 +920,7 @@ static bool auth2(struct smbcli_state *cli,
 	generate_random_buffer(netr_cli_creds.data,
 			       sizeof(netr_cli_creds.data));
 	r.in.credentials = &netr_cli_creds;
-	r.out.credentials = &netr_srv_creds;
+	r.out.return_credentials = &netr_srv_creds;
 
 	status = dcerpc_netr_ServerReqChallenge(net_pipe, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -934,7 +934,7 @@ static bool auth2(struct smbcli_state *cli,
 
 	creds_state = talloc(mem_ctx, struct creds_CredentialState);
 	creds_client_init(creds_state, r.in.credentials,
-			  r.out.credentials, &mach_pw,
+			  r.out.return_credentials, &mach_pw,
 			  &netr_cred, negotiate_flags);
 
 	a.in.server_name = talloc_asprintf(
@@ -2055,7 +2055,7 @@ bool torture_samba3_rpc_randomauth2(struct torture_context *torture)
 	generate_random_buffer(netr_cli_creds.data,
 			       sizeof(netr_cli_creds.data));
 	r.in.credentials = &netr_cli_creds;
-	r.out.credentials = &netr_srv_creds;
+	r.out.return_credentials = &netr_srv_creds;
 
 	status = dcerpc_netr_ServerReqChallenge(net_pipe, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -2069,7 +2069,7 @@ bool torture_samba3_rpc_randomauth2(struct torture_context *torture)
 
 	creds_state = talloc(mem_ctx, struct creds_CredentialState);
 	creds_client_init(creds_state, r.in.credentials,
-			  r.out.credentials, &mach_pw,
+			  r.out.return_credentials, &mach_pw,
 			  &netr_cred, negotiate_flags);
 
 	a.in.server_name = talloc_asprintf(