diff options
Diffstat (limited to 'source3/rpc_client/cli_netlogon.c')
| -rw-r--r-- | source3/rpc_client/cli_netlogon.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index eaee3c26e7c..b5ad7987554 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -35,7 +35,6 @@ NTSTATUS cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, NET_Q_REQ_CHAL q; NET_R_REQ_CHAL r; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - extern pstring global_myname; prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL); prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL); @@ -43,10 +42,10 @@ NTSTATUS cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, /* create and send a MSRPC command with api NET_REQCHAL */ DEBUG(4,("cli_net_req_chal: LSA Request Challenge from %s to %s: %s\n", - global_myname, cli->desthost, credstr(clnt_chal->data))); + global_myname(), cli->desthost, credstr(clnt_chal->data))); /* store the parameters */ - init_q_req_chal(&q, cli->srv_name_slash, global_myname, clnt_chal); + init_q_req_chal(&q, cli->srv_name_slash, global_myname(), clnt_chal); /* Marshall data and send request */ @@ -92,7 +91,6 @@ NTSTATUS cli_net_auth2(struct cli_state *cli, NET_Q_AUTH_2 q; NET_R_AUTH_2 r; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - extern pstring global_myname; prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL); prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL); @@ -100,12 +98,12 @@ NTSTATUS cli_net_auth2(struct cli_state *cli, /* create and send a MSRPC command with api NET_AUTH2 */ DEBUG(4,("cli_net_auth2: srv:%s acct:%s sc:%x mc: %s chal %s neg: %x\n", - cli->srv_name_slash, cli->mach_acct, sec_chan, global_myname, + cli->srv_name_slash, cli->mach_acct, sec_chan, global_myname(), credstr(cli->clnt_cred.challenge.data), neg_flags)); /* store the parameters */ init_q_auth_2(&q, cli->srv_name_slash, cli->mach_acct, - sec_chan, global_myname, &cli->clnt_cred.challenge, + sec_chan, global_myname(), &cli->clnt_cred.challenge, neg_flags); /* turn parameters into data stream */ @@ -168,7 +166,6 @@ NTSTATUS cli_net_auth3(struct cli_state *cli, NET_Q_AUTH_3 q; NET_R_AUTH_3 r; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - extern pstring global_myname; prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL); prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL); @@ -176,12 +173,12 @@ NTSTATUS cli_net_auth3(struct cli_state *cli, /* create and send a MSRPC command with api NET_AUTH2 */ DEBUG(4,("cli_net_auth3: srv:%s acct:%s sc:%x mc: %s chal %s neg: %x\n", - cli->srv_name_slash, cli->mach_acct, sec_chan, global_myname, + cli->srv_name_slash, cli->mach_acct, sec_chan, global_myname(), credstr(cli->clnt_cred.challenge.data), *neg_flags)); /* store the parameters */ init_q_auth_3(&q, cli->srv_name_slash, cli->mach_acct, - sec_chan, global_myname, &cli->clnt_cred.challenge, + sec_chan, global_myname(), &cli->clnt_cred.challenge, *neg_flags); /* turn parameters into data stream */ @@ -500,7 +497,6 @@ NTSTATUS cli_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx, NET_R_SAM_LOGON r; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; DOM_CRED clnt_creds, dummy_rtn_creds; - extern pstring global_myname; NET_ID_INFO_CTR ctr; NET_USER_INFO_3 user; int validation_level = 3; @@ -562,7 +558,7 @@ NTSTATUS cli_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx, goto done; } - init_sam_info(&q.sam_id, cli->srv_name_slash, global_myname, + init_sam_info(&q.sam_id, cli->srv_name_slash, global_myname(), &clnt_creds, &dummy_rtn_creds, logon_type, &ctr); @@ -612,7 +608,6 @@ NTSTATUS cli_netlogon_sam_network_logon(struct cli_state *cli, TALLOC_CTX *mem_c NTSTATUS result = NT_STATUS_UNSUCCESSFUL; DOM_CRED clnt_creds, dummy_rtn_creds; NET_ID_INFO_CTR ctr; - extern pstring global_myname; int validation_level = 3; char *workstation_name_slash; @@ -648,7 +643,7 @@ NTSTATUS cli_netlogon_sam_network_logon(struct cli_state *cli, TALLOC_CTX *mem_c username, workstation_name_slash, (const uchar*)chal, lm_response.data, lm_response.length, nt_response.data, nt_response.length); - init_sam_info(&q.sam_id, cli->srv_name_slash, global_myname, + init_sam_info(&q.sam_id, cli->srv_name_slash, global_myname(), &clnt_creds, &dummy_rtn_creds, NET_LOGON_TYPE, &ctr); @@ -683,7 +678,7 @@ LSA Server Password Set. ****************************************************************************/ NTSTATUS cli_net_srv_pwset(struct cli_state *cli, TALLOC_CTX *mem_ctx, - char* machine_name, uint8 hashed_mach_pwd[16]) + const char *machine_name, uint8 hashed_mach_pwd[16]) { prs_struct rbuf; prs_struct qbuf; |