sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

libcli/auth: also set secure channel type in netlogon_creds_client_init().

Browse Source 
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Günther Deschner 2012-12-19 13:53:23 +01:00 committed by Andreas Schneider
parent b19e7e6638
commit a9d5b2fdf0
8 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/auth/credentials.c
View File

@ -263,6 +263,7 @@ next comes the client specific functions
struct netlogon_creds_CredentialState *netlogon_creds_client_init(TALLOC_CTX *mem_ctx,
const char *client_account,
const char *client_computer_name,
uint16_t secure_channel_type,
const struct netr_Credential *client_challenge,
const struct netr_Credential *server_challenge,
const struct samr_Password *machine_password,
@ -277,6 +278,7 @@ struct netlogon_creds_CredentialState *netlogon_creds_client_init(TALLOC_CTX *me
creds->sequence = time(NULL);
creds->negotiate_flags = negotiate_flags;
creds->secure_channel_type = secure_channel_type;
creds->computer_name = talloc_strdup(creds, client_computer_name);
if (!creds->computer_name) {

1
libcli/auth/proto.h
View File

@ -26,6 +26,7 @@ next comes the client specific functions
struct netlogon_creds_CredentialState *netlogon_creds_client_init(TALLOC_CTX *mem_ctx,
const char *client_account,
const char *client_computer_name,
uint16_t secure_channel_type,
const struct netr_Credential *client_challenge,
const struct netr_Credential *server_challenge,
const struct samr_Password *machine_password,

1
source3/rpc_client/cli_netlogon.c
View File

@ -89,6 +89,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
cli->dc = netlogon_creds_client_init(cli,
mach_acct,
clnt_name,
sec_chan_type,
&clnt_chal_send,
&srv_chal_recv,
&password,

1
source4/librpc/rpc/dcerpc_schannel.c
View File

@ -187,6 +187,7 @@ static void continue_srv_challenge(struct tevent_req *subreq)
s->creds = netlogon_creds_client_init(s,
s->a.in.account_name,
s->a.in.computer_name,
s->a.in.secure_channel_type,
&s->credentials1, &s->credentials2,
s->mach_pwd, &s->credentials3,
s->local_negotiate_flags);

1
source4/torture/ntp/ntp_signd.c
View File

@ -113,6 +113,7 @@ static bool test_ntp_signd(struct torture_context *tctx,
creds = netlogon_creds_client_init(tctx, a.in.account_name,
a.in.computer_name,
a.in.secure_channel_type,
&credentials1, &credentials2,
pwhash, &credentials3,
negotiate_flags);

1
source4/torture/rpc/lsa.c
View File

@ -2715,6 +2715,7 @@ static bool check_pw_with_ServerAuthenticate3(struct dcerpc_pipe *p,
creds = netlogon_creds_client_init(tctx, a.in.account_name,
a.in.computer_name,
a.in.secure_channel_type,
&credentials1, &credentials2,
&mach_password, &credentials3,
negotiate_flags);

3
source4/torture/rpc/netlogon.c
View File

@ -173,6 +173,7 @@ bool test_SetupCredentials(struct dcerpc_pipe *p, struct torture_context *tctx,
creds = netlogon_creds_client_init(tctx, a.in.account_name,
a.in.computer_name,
a.in.secure_channel_type,
&credentials1, &credentials2,
mach_password, &credentials3,
0);
@ -243,6 +244,7 @@ bool test_SetupCredentials2(struct dcerpc_pipe *p, struct torture_context *tctx,
creds = netlogon_creds_client_init(tctx, a.in.account_name,
a.in.computer_name,
a.in.secure_channel_type,
&credentials1, &credentials2,
mach_password, &credentials3,
negotiate_flags);
@ -310,6 +312,7 @@ bool test_SetupCredentials3(struct dcerpc_pipe *p, struct torture_context *tctx,
creds = netlogon_creds_client_init(tctx, a.in.account_name,
a.in.computer_name,
a.in.secure_channel_type,
&credentials1, &credentials2,
&mach_password, &credentials3,
negotiate_flags);

2
source4/torture/rpc/samba3rpc.c
View File

@ -1015,6 +1015,7 @@ static bool auth2(struct torture_context *tctx,
creds_state = netlogon_creds_client_init(mem_ctx,
a.in.account_name,
a.in.computer_name,
a.in.secure_channel_type,
r.in.credentials,
r.out.return_credentials, &mach_pw,
&netr_cred, negotiate_flags);
@ -2146,6 +2147,7 @@ static bool torture_samba3_rpc_randomauth2(struct torture_context *torture)
creds_state = netlogon_creds_client_init(mem_ctx,
a.in.account_name,
a.in.computer_name,
a.in.secure_channel_type,
r.in.credentials,
r.out.return_credentials, &mach_pw,
&netr_cred, negotiate_flags);