From 8d7c88667190fe286971ac4fffb64ee5bd9eeeb0 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 18 Oct 2005 03:24:00 +0000
Subject: 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)
---
source3/smbd/error.c | 2 +-
source3/smbd/lanman.c | 4 ++--
source3/smbd/negprot.c | 4 ++--
source3/smbd/reply.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'source3/smbd')
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 3cdcae5c7f5..fa236f0de05 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 0666fe8913e..3e1174b22fd 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 91942bf028f..65c31449bb2 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 47da9032563..beed90f9aa7 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;
--
cgit