diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-29 01:23:49 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-29 08:57:52 +0100 |
| commit | 1798e9d7ec259396e9188714c1b3742f24e3ecfd (patch) | |
| tree | 8ec9d69eb02d7d6916625ba993e27bb3d800320f /source4/torture | |
| parent | 8e4c691c0aa406eedf52afb5cee33ff1540c0f8d (diff) | |
| download | samba-1798e9d7ec259396e9188714c1b3742f24e3ecfd.tar.gz samba-1798e9d7ec259396e9188714c1b3742f24e3ecfd.tar.bz2 samba-1798e9d7ec259396e9188714c1b3742f24e3ecfd.zip | |
s4-netlogon: merge netr_ServerReqChallenge from s3 idl.
Guenther
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/ndr/netlogon.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/netlogon.c | 6 | ||||
| -rw-r--r-- | source4/torture/rpc/samba3rpc.c | 8 |
3 files changed, 8 insertions, 8 deletions
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( |