size_t != int. Make this compile on 64 bit platforms (eg: amd64).
Also, "u_short value; if (value > 0xffff)" can never be true.
This commit is contained in:
parent
f8bb2e0ffd
commit
7d6207b7dd
@ -332,7 +332,8 @@ smbfs_init(struct vfsconf *vfsp)
|
|||||||
{
|
{
|
||||||
#ifndef SMP
|
#ifndef SMP
|
||||||
int name[2];
|
int name[2];
|
||||||
int olen, ncpu, plen, error;
|
int ncpu, error;
|
||||||
|
size_t olen, plen;
|
||||||
|
|
||||||
name[0] = CTL_HW;
|
name[0] = CTL_HW;
|
||||||
name[1] = HW_NCPU;
|
name[1] = HW_NCPU;
|
||||||
|
@ -206,7 +206,8 @@ int
|
|||||||
ncp_renegotiate_connparam(struct ncp_conn *conn, int buffsize, u_int8_t in_options)
|
ncp_renegotiate_connparam(struct ncp_conn *conn, int buffsize, u_int8_t in_options)
|
||||||
{
|
{
|
||||||
u_int8_t options;
|
u_int8_t options;
|
||||||
int neg_buffsize, error, sl, ckslevel, ilen;
|
int neg_buffsize, error, sl, ckslevel;
|
||||||
|
size_t ilen;
|
||||||
|
|
||||||
sl = conn->li.sig_level;
|
sl = conn->li.sig_level;
|
||||||
if (sl >= 2)
|
if (sl >= 2)
|
||||||
|
@ -302,8 +302,7 @@ smb_usr_t2request(struct smb_share *ssp, struct smbioc_t2rq *dp,
|
|||||||
struct mdchain *mdp;
|
struct mdchain *mdp;
|
||||||
int error, len;
|
int error, len;
|
||||||
|
|
||||||
if (dp->ioc_tparamcnt > 0xffff || dp->ioc_tdatacnt > 0xffff ||
|
if (dp->ioc_setupcnt > 3)
|
||||||
dp->ioc_setupcnt > 3)
|
|
||||||
return EINVAL;
|
return EINVAL;
|
||||||
error = smb_t2_init(t2p, SSTOCP(ssp), dp->ioc_setup[0], scred);
|
error = smb_t2_init(t2p, SSTOCP(ssp), dp->ioc_setup[0], scred);
|
||||||
if (error)
|
if (error)
|
||||||
|
Loading…
Reference in New Issue
Block a user