diff options
| -rw-r--r-- | source3/auth/auth_rhosts.c | 2 | ||||
| -rw-r--r-- | source3/auth/auth_sam.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/cliconnect.c | 4 | ||||
| -rw-r--r-- | source3/popt/popthelp.c | 4 | ||||
| -rw-r--r-- | source3/smbd/auth_rhosts.c | 2 | ||||
| -rw-r--r-- | source3/smbd/auth_smbpasswd.c | 2 | ||||
| -rw-r--r-- | source3/smbd/notify_hash.c | 2 | ||||
| -rw-r--r-- | source3/utils/net.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/source3/auth/auth_rhosts.c b/source3/auth/auth_rhosts.c index cd1bf57f86..d6ca01936f 100644 --- a/source3/auth/auth_rhosts.c +++ b/source3/auth/auth_rhosts.c @@ -86,7 +86,7 @@ static BOOL check_user_equiv(const char *user, const char *remote, const char *e static char *mydomain = NULL; if (!mydomain) yp_get_default_domain(&mydomain); - if (mydomain && innetgr(file_host,remote,user,mydomain)) + if (mydomain && innetgr(file_host,(char *)remote,(char *)user,mydomain)) host_ok = True; } #else diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c index a525248461..2070f09fd6 100644 --- a/source3/auth/auth_sam.c +++ b/source3/auth/auth_sam.c @@ -311,7 +311,7 @@ NTSTATUS check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_ return NT_STATUS_NO_SUCH_USER; } - nt_status = sam_password_ok(sampass, user_info, server_info->session_key); + nt_status = sam_password_ok(sampass, user_info, (char *)(server_info->session_key)); if NT_STATUS_IS_OK(nt_status) { nt_status = sam_account_ok(sampass, user_info); diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 2dad0247b2..680f30900e 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -460,8 +460,8 @@ static BOOL cli_session_setup_ntlmssp(struct cli_state *cli, char *user, /* encrypt the password with the challenge */ memcpy(challenge, chal1.data + 24, 8); - SMBencrypt(pass, challenge,lmhash); - SMBNTencrypt(pass, challenge,nthash); + SMBencrypt((unsigned char *)pass, challenge,lmhash); + SMBNTencrypt((unsigned char *)pass, challenge,nthash); #if 0 file_save("nthash.dat", nthash, 24); diff --git a/source3/popt/popthelp.c b/source3/popt/popthelp.c index c36eceadd9..6b790a63e7 100644 --- a/source3/popt/popthelp.c +++ b/source3/popt/popthelp.c @@ -26,7 +26,7 @@ struct poptOption poptHelpOptions[] = { } ; -/*@observer@*/ /*@null@*/ static const char *const +/*@observer@*/ /*@null@*/ static const char * getTableTranslationDomain(const struct poptOption *table) { const struct poptOption *opt; @@ -41,7 +41,7 @@ getTableTranslationDomain(const struct poptOption *table) return NULL; } -/*@observer@*/ /*@null@*/ static const char *const +/*@observer@*/ /*@null@*/ static const char * getArgDescrip(const struct poptOption * opt, const char *translation_domain) { if (!(opt->argInfo & POPT_ARG_MASK)) return NULL; diff --git a/source3/smbd/auth_rhosts.c b/source3/smbd/auth_rhosts.c index cd1bf57f86..d6ca01936f 100644 --- a/source3/smbd/auth_rhosts.c +++ b/source3/smbd/auth_rhosts.c @@ -86,7 +86,7 @@ static BOOL check_user_equiv(const char *user, const char *remote, const char *e static char *mydomain = NULL; if (!mydomain) yp_get_default_domain(&mydomain); - if (mydomain && innetgr(file_host,remote,user,mydomain)) + if (mydomain && innetgr(file_host,(char *)remote,(char *)user,mydomain)) host_ok = True; } #else diff --git a/source3/smbd/auth_smbpasswd.c b/source3/smbd/auth_smbpasswd.c index a525248461..2070f09fd6 100644 --- a/source3/smbd/auth_smbpasswd.c +++ b/source3/smbd/auth_smbpasswd.c @@ -311,7 +311,7 @@ NTSTATUS check_smbpasswd_security(const auth_usersupplied_info *user_info, auth_ return NT_STATUS_NO_SUCH_USER; } - nt_status = sam_password_ok(sampass, user_info, server_info->session_key); + nt_status = sam_password_ok(sampass, user_info, (char *)(server_info->session_key)); if NT_STATUS_IS_OK(nt_status) { nt_status = sam_account_ok(sampass, user_info); diff --git a/source3/smbd/notify_hash.c b/source3/smbd/notify_hash.c index b4edc258e9..a8470102d5 100644 --- a/source3/smbd/notify_hash.c +++ b/source3/smbd/notify_hash.c @@ -116,7 +116,7 @@ static BOOL notify_hash(connection_struct *conn, char *path, uint32 flags, if (flags & (FILE_NOTIFY_CHANGE_DIR_NAME|FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_FILE)) { int i; unsigned char tmp_hash[16]; - mdfour(tmp_hash, fname, strlen(fname)); + mdfour(tmp_hash, (const unsigned char *)fname, strlen(fname)); for (i=0;i<16;i++) data->name_hash[i] ^= tmp_hash[i]; } diff --git a/source3/utils/net.c b/source3/utils/net.c index 349f1c4f60..611f79e7f3 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -1279,7 +1279,7 @@ int main(int argc,char *argv[]) lp_load(servicesf,True,False,False); - argv_new = poptGetArgs(pc); + argv_new = (char **)poptGetArgs(pc); for (i=0; i<argc; i++) { if (argv_new[i] == NULL) { |