diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/auth.c | 6 | ||||
| -rw-r--r-- | source3/smbd/auth_server.c | 4 | ||||
| -rw-r--r-- | source3/smbd/auth_smbpasswd.c | 6 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 4 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/source3/smbd/auth.c b/source3/smbd/auth.c index d33bc225e6..8ea867fe8c 100644 --- a/source3/smbd/auth.c +++ b/source3/smbd/auth.c @@ -188,7 +188,7 @@ uint32 pass_check_smb_with_chal(char *user, char *domain, uchar chal[8], user_info.nt_resp.len = 24; } - user_info.plaintext_password.str = lm_pwd; + user_info.plaintext_password.str = (char *)lm_pwd; user_info.plaintext_password.len = lm_pwd_len; } @@ -232,11 +232,11 @@ BOOL password_ok(char *user, char *password, int pwlen) /* The password could be either NTLM or plain LM. Try NTLM first, but fall-through as required. */ - if (pass_check_smb(user, lp_workgroup(), NULL, 0, password, pwlen) == NT_STATUS_NOPROBLEMO) { + if (pass_check_smb(user, lp_workgroup(), NULL, 0, (unsigned char *)password, pwlen) == NT_STATUS_NOPROBLEMO) { return True; } - if (pass_check_smb(user, lp_workgroup(), password, pwlen, NULL, 0) == NT_STATUS_NOPROBLEMO) { + if (pass_check_smb(user, lp_workgroup(), (unsigned char *)password, pwlen, NULL, 0) == NT_STATUS_NOPROBLEMO) { return True; } diff --git a/source3/smbd/auth_server.c b/source3/smbd/auth_server.c index 0711b056bd..ad66f0c4ac 100644 --- a/source3/smbd/auth_server.c +++ b/source3/smbd/auth_server.c @@ -205,9 +205,9 @@ use this machine as the password server.\n")); */ if (!cli_session_setup(cli, user_info->smb_username.str, - user_info->lm_resp.buffer, + (char *)user_info->lm_resp.buffer, user_info->lm_resp.len, - user_info->nt_resp.buffer, + (char *)user_info->nt_resp.buffer, user_info->nt_resp.len, user_info->domain.str)) { DEBUG(1,("password server %s rejected the password\n", cli->desthost)); diff --git a/source3/smbd/auth_smbpasswd.c b/source3/smbd/auth_smbpasswd.c index 27cb801c33..1a5d02e4a4 100644 --- a/source3/smbd/auth_smbpasswd.c +++ b/source3/smbd/auth_smbpasswd.c @@ -45,7 +45,7 @@ static BOOL smb_pwd_check_ntlmv1(const uchar *password, SMBOWFencrypt(part_passwd, c8, p24); if (user_sess_key != NULL) { - SMBsesskeygen_ntv1(part_passwd, NULL, user_sess_key); + SMBsesskeygen_ntv1(part_passwd, NULL, (char *)user_sess_key); } @@ -84,7 +84,7 @@ static BOOL smb_pwd_check_ntlmv2(const uchar *password, size_t pwd_len, } ntv2_owf_gen(part_passwd, user, domain, kr); - SMBOWFencrypt_ntv2(kr, c8, 8, password+16, pwd_len-16, resp); + SMBOWFencrypt_ntv2(kr, c8, 8, password+16, pwd_len-16, (char *)resp); if (user_sess_key != NULL) { SMBsesskeygen_ntv2(kr, resp, user_sess_key); @@ -154,7 +154,7 @@ uint32 smb_password_ok(SAM_ACCOUNT *sampass, const auth_usersupplied_info *user_ nt_pw, user_info->chal, user_info->requested_username.str, user_info->requested_domain.str, - server_info->session_key)) + (char *)server_info->session_key)) { return NT_STATUS_NOPROBLEMO; } diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index fca16a2f04..02531bd1cd 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -812,8 +812,8 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,int if (!guest) { valid_password = (pass_check_smb(user, domain, - smb_apasswd, smb_apasslen, - smb_ntpasswd, smb_ntpasslen) == NT_STATUS_NOPROBLEMO); + (unsigned char *)smb_apasswd, smb_apasslen, + (unsigned char *)smb_ntpasswd, smb_ntpasslen) == NT_STATUS_NOPROBLEMO); /* The true branch will be executed if (1) the NT password failed (or was not tried), and diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 9709fc6a20..f5870a3119 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -356,7 +356,7 @@ int vfs_allocate_file_space(files_struct *fsp, SMB_OFF_T len) while ( len_to_write > 0) { SMB_OFF_T current_len_to_write = MIN(sizeof(zero_space),len_to_write); - retlen = vfs_ops->write(fsp,fsp->fd,zero_space,current_len_to_write); + retlen = vfs_ops->write(fsp,fsp->fd,(const char *)zero_space,current_len_to_write); if (retlen <= 0) { /* Write fail - return to original size. */ int save_errno = errno; |