diff options
| author | Herb Lewis <herb@samba.org> | 2002-01-02 23:03:27 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2002-01-02 23:03:27 +0000 |
| commit | a7375aac6d01bc6fdbbe9c1e8948a0113f9ff0d0 (patch) | |
| tree | 57379a0486014c937fc14ad0869c73e1243e6ac7 | |
| parent | 9bccdf577c8da0d1ee371832b28bb94968decb33 (diff) | |
| download | samba-a7375aac6d01bc6fdbbe9c1e8948a0113f9ff0d0.tar.gz samba-a7375aac6d01bc6fdbbe9c1e8948a0113f9ff0d0.tar.xz samba-a7375aac6d01bc6fdbbe9c1e8948a0113f9ff0d0.zip | |
comile error and warnings on IRIX
| -rw-r--r-- | source/include/rpc_srvsvc.h | 2 | ||||
| -rw-r--r-- | source/libsmb/cli_netlogon.c | 6 | ||||
| -rw-r--r-- | source/libsmb/clistr.c | 4 | ||||
| -rw-r--r-- | source/smbd/password.c | 2 | ||||
| -rw-r--r-- | source/tdb/tdb.c | 3 |
5 files changed, 8 insertions, 9 deletions
diff --git a/source/include/rpc_srvsvc.h b/source/include/rpc_srvsvc.h index 651c0b97673..0493b552e8b 100644 --- a/source/include/rpc_srvsvc.h +++ b/source/include/rpc_srvsvc.h @@ -54,7 +54,7 @@ typedef struct disk_enum_container { uint32 level; uint32 entries_read; uint32 unknown; - uint32 disk_info_ptr; + DISK_INFO *disk_info_ptr; DISK_INFO disk_info[MAX_SERVER_DISK_ENTRIES]; } DISK_ENUM_CONTAINER; diff --git a/source/libsmb/cli_netlogon.c b/source/libsmb/cli_netlogon.c index 7499d9ca7bd..1e4f7955d26 100644 --- a/source/libsmb/cli_netlogon.c +++ b/source/libsmb/cli_netlogon.c @@ -438,7 +438,7 @@ NTSTATUS cli_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx, 0, /* param_ctrl */ 0xdead, 0xbeef, /* LUID? */ username, cli->clnt_name_slash, - cli->sess_key, lm_owf_user_pwd, + (char *)cli->sess_key, lm_owf_user_pwd, nt_owf_user_pwd); break; @@ -450,8 +450,8 @@ NTSTATUS cli_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx, generate_random_buffer(chal, 8, False); - SMBencrypt(password, chal, local_lm_response); - SMBNTencrypt(password, chal, local_nt_response); + SMBencrypt((unsigned char *)password, chal, local_lm_response); + SMBNTencrypt((unsigned char *)password, chal, local_nt_response); init_id_info2(&ctr.auth.id2, lp_workgroup(), 0, /* param_ctrl */ diff --git a/source/libsmb/clistr.c b/source/libsmb/clistr.c index 79b896532c3..edc29ee828b 100644 --- a/source/libsmb/clistr.c +++ b/source/libsmb/clistr.c @@ -130,7 +130,7 @@ int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len if (flags & STR_TERMINATE) { int i; for (i=0; i < src_len; i += 2) { - const smb_ucs2_t c = (const smb_ucs2_t)SVAL(src, i); + const smb_ucs2_t c = (smb_ucs2_t)SVAL(src, i); if (c == (smb_ucs2_t)0 || (dest_len - i < 3)) break; dest += unicode_to_unix_char(dest, c); @@ -142,7 +142,7 @@ int clistr_pull(struct cli_state *cli, char *dest, const void *src, int dest_len if (dest_len*2 < src_len) src_len = 2*dest_len; for (i=0; i < src_len; i += 2) { - const smb_ucs2_t c = (const smb_ucs2_t)SVAL(src, i); + const smb_ucs2_t c = (smb_ucs2_t)SVAL(src, i); dest += unicode_to_unix_char(dest, c); } *dest++ = 0; diff --git a/source/smbd/password.c b/source/smbd/password.c index f408a3e021d..b240ccfd774 100644 --- a/source/smbd/password.c +++ b/source/smbd/password.c @@ -670,7 +670,7 @@ static char *validate_group(const char *group,char *password,int pwlen,int snum) #ifdef HAVE_NETGROUP { char *host, *user, *domain; - setnetgrent(group); + setnetgrent((char *)group); while (getnetgrent(&host, &user, &domain)) { if (user) { if (user_ok(user, snum) && diff --git a/source/tdb/tdb.c b/source/tdb/tdb.c index eab14cf5aeb..fce5d5c943f 100644 --- a/source/tdb/tdb.c +++ b/source/tdb/tdb.c @@ -465,12 +465,11 @@ void tdb_dump_all(TDB_CONTEXT *tdb) void tdb_printfreelist(TDB_CONTEXT *tdb) { long total_free = 0; - tdb_off offset, rec_ptr, last_ptr; + tdb_off offset, rec_ptr; struct list_struct rec; tdb_lock(tdb, -1, F_WRLCK); - last_ptr = 0; offset = FREELIST_TOP; /* read in the freelist top */ |