summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/rpc_client/cli_login.c6
-rw-r--r--source3/rpc_client/cli_pipe.c4
-rw-r--r--source3/rpc_server/srv_util.c14
-rw-r--r--source3/rpcclient/cmd_samr.c8
4 files changed, 16 insertions, 16 deletions
diff --git a/source3/rpc_client/cli_login.c b/source3/rpc_client/cli_login.c
index 1b12828550..e18062220b 100644
--- a/source3/rpc_client/cli_login.c
+++ b/source3/rpc_client/cli_login.c
@@ -106,13 +106,13 @@ BOOL cli_nt_login_interactive(struct cli_state *cli, char *domain, char *usernam
uint32 smb_userid_low, char *password,
NET_ID_INFO_CTR *ctr, NET_USER_INFO_3 *user_info3)
{
- unsigned char lm_owf_user_pwd[16];
- unsigned char nt_owf_user_pwd[16];
+ uchar lm_owf_user_pwd[16];
+ uchar nt_owf_user_pwd[16];
BOOL ret;
DEBUG(5,("cli_nt_login_interactive: %d\n", __LINE__));
- nt_lm_owf_gen(password, (char *)nt_owf_user_pwd, (char *)lm_owf_user_pwd);
+ nt_lm_owf_gen(password, nt_owf_user_pwd, lm_owf_user_pwd);
#ifdef DEBUG_PASSWORD
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index f5587567cd..1a72f930c5 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -157,7 +157,7 @@ static BOOL rpc_auth_pipe(struct cli_state *cli, prs_struct *rdata,
{
DEBUG(10,("rpc_auth_pipe: seal\n"));
dump_data(100, reply_data, data_len);
- NTLMSSPcalc(cli->ntlmssp_hash, reply_data, data_len);
+ NTLMSSPcalc(cli->ntlmssp_hash, (uchar*)reply_data, data_len);
dump_data(100, reply_data, data_len);
}
@@ -180,7 +180,7 @@ static BOOL rpc_auth_pipe(struct cli_state *cli, prs_struct *rdata,
if (auth_verify)
{
prs_struct auth_verf;
- char *data = (uchar*)mem_data(&rdata->data, len - auth_len);
+ char *data = mem_data(&rdata->data, len - auth_len);
if (data == NULL) return False;
DEBUG(10,("rpc_auth_pipe: verify\n"));
diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 0cb730470e..1c57efc3f4 100644
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -252,7 +252,7 @@ BOOL create_rpc_reply(pipes_struct *p,
if (auth_seal)
{
- NTLMSSPcalc(p->ntlmssp_hash, data, data_len);
+ NTLMSSPcalc(p->ntlmssp_hash, (uchar*)data, data_len);
crc32 = crc32_calc_buffer(data_len, data);
}
@@ -267,8 +267,8 @@ BOOL create_rpc_reply(pipes_struct *p,
char *auth_data;
make_rpc_auth_ntlmssp_chk(&p->ntlmssp_chk, NTLMSSP_SIGN_VERSION, crc32, p->ntlmssp_seq_num);
smb_io_rpc_auth_ntlmssp_chk("auth_sign", &(p->ntlmssp_chk), &p->rverf, 0);
- auth_data = (uchar*)mem_data(&p->rverf.data, 4);
- NTLMSSPcalc(p->ntlmssp_hash, auth_data, 12);
+ auth_data = mem_data(&p->rverf.data, 4);
+ NTLMSSPcalc(p->ntlmssp_hash, (uchar*)auth_data, 12);
}
}
@@ -601,9 +601,9 @@ static BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *pd)
if (auth_seal)
{
- char *data = (uchar*)mem_data(&pd->data, pd->offset);
+ char *data = mem_data(&pd->data, pd->offset);
DEBUG(5,("api_pipe_auth_process: data %d\n", pd->offset));
- NTLMSSPcalc(p->ntlmssp_hash, data, data_len);
+ NTLMSSPcalc(p->ntlmssp_hash, (uchar*)data, data_len);
crc32 = crc32_calc_buffer(data_len, data);
}
@@ -618,9 +618,9 @@ static BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *pd)
if (auth_verify)
{
- char *req_data = (uchar*)mem_data(&pd->data, pd->offset + 4);
+ char *req_data = mem_data(&pd->data, pd->offset + 4);
DEBUG(5,("api_pipe_auth_process: auth %d\n", pd->offset + 4));
- NTLMSSPcalc(p->ntlmssp_hash, req_data, 12);
+ NTLMSSPcalc(p->ntlmssp_hash, (uchar*)req_data, 12);
smb_io_rpc_auth_ntlmssp_chk("auth_sign", &(p->ntlmssp_chk), pd, 0);
if (!rpc_auth_ntlmssp_chk(&(p->ntlmssp_chk), crc32,
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 69e29f032a..fa4c631899 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -48,11 +48,11 @@ void cmd_sam_ntchange_pwd(struct client_info *info)
fstring sid;
char *new_passwd;
BOOL res = True;
- uchar nt_newpass[516];
+ char nt_newpass[516];
uchar nt_hshhash[16];
uchar nt_newhash[16];
uchar nt_oldhash[16];
- uchar lm_newpass[516];
+ char lm_newpass[516];
uchar lm_newhash[16];
uchar lm_hshhash[16];
uchar lm_oldhash[16];
@@ -99,8 +99,8 @@ void cmd_sam_ntchange_pwd(struct client_info *info)
/* establish a connection. */
res = res ? do_samr_chgpasswd_user(smb_cli,
srv_name, smb_cli->user_name,
- nt_newpass, nt_hshhash,
- lm_newpass, lm_hshhash) : False;
+ nt_newpass, (char*)nt_hshhash,
+ lm_newpass, (char*)lm_hshhash) : False;
/* close the session */
cli_nt_session_close(smb_cli);