diff options
| author | Jeremy Allison <jra@samba.org> | 2005-10-18 03:24:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:02 -0500 |
| commit | 8d7c88667190fe286971ac4fffb64ee5bd9eeeb0 (patch) | |
| tree | d5b2f0850d63a07e051c03a7abe1f10884598161 /source3/smbd | |
| parent | afca439d19e3d9e67b127d7060df630e2218bcb2 (diff) | |
| download | samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.tar.gz samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.tar.bz2 samba-8d7c88667190fe286971ac4fffb64ee5bd9eeeb0.zip | |
r11137: Compile with only 2 warnings (I'm still working on that code) on a gcc4
x86_64 box.
Jeremy.
(This used to be commit d720867a788c735e56d53d63265255830ec21208)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/error.c | 2 | ||||
| -rw-r--r-- | source3/smbd/lanman.c | 4 | ||||
| -rw-r--r-- | source3/smbd/negprot.c | 4 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/error.c b/source3/smbd/error.c index 3cdcae5c7f..fa236f0de0 100644 --- a/source3/smbd/error.c +++ b/source3/smbd/error.c @@ -26,7 +26,7 @@ extern struct unix_error_map unix_dos_nt_errmap[]; extern uint32 global_client_caps; /* these can be set by some functions to override the error codes */ static int override_ERR_class; -static int override_ERR_code; +static uint32 override_ERR_code; static NTSTATUS override_ERR_ntstatus; /**************************************************************************** diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 0666fe8913..3e1174b22f 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -1797,8 +1797,8 @@ static BOOL api_NetUserGetGroups(connection_struct *conn,uint16 vuid, char *para BOOL ret = False; DOM_SID *sids; gid_t *gids; - int num_groups; - int i; + size_t num_groups; + size_t i; fstring grp_domain; fstring grp_name; enum SID_NAME_USE grp_type; diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 91942bf028..65c31449bb 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -172,7 +172,7 @@ static int negprot_spnego(char *p, uint8 *pkeylen) DATA_BLOB blob; nstring dos_name; fstring unix_name; - uint8 guid[17]; + char guid[17]; const char *OIDs_krb5[] = {OID_KERBEROS5, OID_KERBEROS5_OLD, OID_NTLMSSP, @@ -186,7 +186,7 @@ static int negprot_spnego(char *p, uint8 *pkeylen) safe_strcpy(unix_name, global_myname(), sizeof(unix_name)-1); strlower_m(unix_name); push_ascii_nstring(dos_name, unix_name); - safe_strcpy((char *)guid, dos_name, sizeof(guid)-1); + safe_strcpy(guid, dos_name, sizeof(guid)-1); #ifdef DEVELOPER /* valgrind fixer... */ diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 47da903256..beed90f9aa 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2130,7 +2130,7 @@ void send_file_readbraw(connection_struct *conn, files_struct *fsp, SMB_OFF_T st DATA_BLOB header; _smb_setlen(outbuf,nread); - header.data = outbuf; + header.data = (uint8 *)outbuf; header.length = 4; header.free = NULL; @@ -2509,7 +2509,7 @@ int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length SSVAL(smb_buf(outbuf),-2,smb_maxcnt); SCVAL(outbuf,smb_vwv0,0xFF); set_message(outbuf,12,smb_maxcnt,False); - header.data = outbuf; + header.data = (uint8 *)outbuf; header.length = data - outbuf; header.free = NULL; |