diff options
Diffstat (limited to 'source3/rpc_client')
| -rw-r--r-- | source3/rpc_client/cli_login.c | 9 | ||||
| -rw-r--r-- | source3/rpc_client/cli_netlogon.c | 29 |
2 files changed, 21 insertions, 17 deletions
diff --git a/source3/rpc_client/cli_login.c b/source3/rpc_client/cli_login.c index 205ccc7a24..6600fac162 100644 --- a/source3/rpc_client/cli_login.c +++ b/source3/rpc_client/cli_login.c @@ -161,15 +161,14 @@ BOOL cli_nt_login_network(struct cli_state *cli, char *domain, char *username, NET_ID_INFO_CTR *ctr, NET_USER_INFO_3 *user_info3) { DEBUG(5,("cli_nt_login_network: %d\n", __LINE__)); - /* indicate a "network" login */ ctr->switch_value = NET_LOGON_TYPE; /* Create the structure needed for SAM logon. */ - init_id_info2(&ctr->auth.id2, domain, 0, - smb_userid_low, 0, - username, cli->clnt_name_slash, - (uchar *)lm_chal, (uchar *)lm_chal_resp, (uchar *)nt_chal_resp); + init_id_info2(&ctr->auth.id2, domain, 0, smb_userid_low, 0, + username, dos_to_unix(cli->clnt_name_slash, False), + (uchar *)lm_chal, (uchar *)lm_chal_resp, + (uchar *)nt_chal_resp); /* Send client sam-logon request - update credentials on success. */ return cli_net_sam_logon(cli, ctr, user_info3); diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index 3e24e74a59..209b38c4fa 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -73,7 +73,8 @@ BOOL cli_net_logon_ctrl2(struct cli_state *cli, uint32 status_level) global_myname, status_level)); /* store the parameters */ - init_q_logon_ctrl2(&q_l, cli->srv_name_slash, status_level); + init_q_logon_ctrl2(&q_l, unix_to_dos(cli->srv_name_slash,False), + status_level); /* turn parameters into data stream */ if(!net_io_q_logon_ctrl2("", &q_l, &buf, 0)) { @@ -131,12 +132,12 @@ BOOL cli_net_auth2(struct cli_state *cli, uint16 sec_chan, /* 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, - credstr(cli->clnt_cred.challenge.data), neg_flags)); + 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_a, cli->srv_name_slash, cli->mach_acct, sec_chan, global_myname, - &cli->clnt_cred.challenge, neg_flags); + init_q_auth_2(&q_a, unix_to_dos(cli->srv_name_slash,False), cli->mach_acct, + sec_chan, global_myname, &cli->clnt_cred.challenge, neg_flags); /* turn parameters into data stream */ if(!net_io_q_auth_2("", &q_a, &buf, 0)) { @@ -224,7 +225,8 @@ BOOL cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, DOM_CHAL *srv_ cli->desthost, global_myname, credstr(clnt_chal->data))); /* store the parameters */ - init_q_req_chal(&q_c, cli->srv_name_slash, global_myname, clnt_chal); + init_q_req_chal(&q_c, unix_to_dos(cli->srv_name_slash,False), + global_myname, clnt_chal); /* turn parameters into data stream */ if(!net_io_q_req_chal("", &q_c, &buf, 0)) { @@ -289,8 +291,9 @@ BOOL cli_net_srv_pwset(struct cli_state *cli, uint8 hashed_mach_pwd[16]) credstr(new_clnt_cred.challenge.data), new_clnt_cred.timestamp.time)); /* store the parameters */ - init_q_srv_pwset(&q_s, cli->srv_name_slash, cli->mach_acct, sec_chan_type, - global_myname, &new_clnt_cred, (char *)hashed_mach_pwd); + init_q_srv_pwset(&q_s, unix_to_dos(cli->srv_name_slash,False), + cli->mach_acct, sec_chan_type, global_myname, + &new_clnt_cred, (char *)hashed_mach_pwd); /* turn parameters into data stream */ if(!net_io_q_srv_pwset("", &q_s, &buf, 0)) { @@ -365,8 +368,9 @@ BOOL cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr, /* store the parameters */ q_s.validation_level = validation_level; - init_sam_info(&q_s.sam_id, cli->srv_name_slash, global_myname, - &new_clnt_cred, &dummy_rtn_creds, ctr->switch_value, ctr); + init_sam_info(&q_s.sam_id, unix_to_dos(cli->srv_name_slash,False), + global_myname, &new_clnt_cred, &dummy_rtn_creds, + ctr->switch_value, ctr); /* turn parameters into data stream */ if(!net_io_q_sam_logon("", &q_s, &buf, 0)) { @@ -451,8 +455,9 @@ BOOL cli_net_sam_logoff(struct cli_state *cli, NET_ID_INFO_CTR *ctr) memset(&dummy_rtn_creds, '\0', sizeof(dummy_rtn_creds)); - init_sam_info(&q_s.sam_id, cli->srv_name_slash, global_myname, - &new_clnt_cred, &dummy_rtn_creds, ctr->switch_value, ctr); + init_sam_info(&q_s.sam_id, unix_to_dos(cli->srv_name_slash,False), + global_myname, &new_clnt_cred, &dummy_rtn_creds, + ctr->switch_value, ctr); /* turn parameters into data stream */ if(!net_io_q_sam_logoff("", &q_s, &buf, 0)) { |