sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00
Code

Don't use uint. It doesn't exist on some platforms and we don't define it.

Browse Source 
Replaced with "unsigned int".
Jeremy.
This commit is contained in:
Jeremy Allison -
parent a905b5f49d
commit 5841ca54b6
8 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/include/libsmbclient.h
View File

@ -93,22 +93,22 @@ struct smbc_dirent
SMBC_DIR=7,
SMBC_FILE=8,
SMBC_LINK=9,*/
uint smbc_type;
unsigned int smbc_type;
/** Length of this smbc_dirent in bytes
*/
uint dirlen;
unsigned int dirlen;
/** The length of the comment string in bytes (includes null
* terminator)
*/
uint commentlen;
unsigned int commentlen;
/** Points to the null terminated comment string
*/
char *comment;
/** The length of the name string in bytes (includes null
* terminator)
*/
uint namelen;
unsigned int namelen;
/** Points to the null terminated name string
*/
char name[1];

2
source/libsmb/cli_samr.c
View File

@ -407,7 +407,7 @@ NTSTATUS cli_samr_query_useraliases(struct cli_state *cli, TALLOC_CTX *mem_ctx,
SAMR_Q_QUERY_USERALIASES q;
SAMR_R_QUERY_USERALIASES r;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
uint ptr=1;
unsigned int ptr=1;
ZERO_STRUCT(q);
ZERO_STRUCT(r);

8
source/libsmb/cliconnect.c
View File

@ -634,10 +634,12 @@ BOOL cli_session_setup(struct cli_state *cli,
return cli_session_setup_plaintext(cli, user, pass, workgroup);
}
#if 0 /* JRATEST for signing. */
/* if the server supports extended security then use SPNEGO */
if (cli->capabilities & CAP_EXTENDED_SECURITY) {
return cli_session_setup_spnego(cli, user, pass, workgroup);
}
#endif
/* otherwise do a NT1 style session setup */
return cli_session_setup_nt1(cli, user,
@ -822,6 +824,10 @@ BOOL cli_negprot(struct cli_state *cli)
cli->use_spnego = False;
}
#if 1 /* JRA SIGN TEST */
cli->use_spnego = False;
#endif
memset(cli->outbuf,'\0',smb_size);
/* setup the protocol strings */
@ -886,8 +892,10 @@ BOOL cli_negprot(struct cli_state *cli)
if (getenv("CLI_FORCE_SMB_SIGNING"))
cli->sign_info.negotiated_smb_signing = True;
#if 0
if (cli->sign_info.negotiated_smb_signing && !(cli->sec_mode & NEGOTIATE_SECURITY_SIGNATURES_ENABLED))
cli->sign_info.negotiated_smb_signing = False;
#endif
} else if (cli->protocol >= PROTOCOL_LANMAN1) {
cli->use_spnego = False;

2
source/libsmb/clifile.c
View File

@ -76,7 +76,7 @@ static BOOL cli_link_internal(struct cli_state *cli, const char *fname_src, cons
uint32 unix_perms_to_wire(mode_t perms)
{
uint ret = 0;
unsigned int ret = 0;
ret |= ((perms & S_IXOTH) ? UNIX_X_OTH : 0);
ret |= ((perms & S_IWOTH) ? UNIX_W_OTH : 0);

10
source/libsmb/clirap2.c
View File

@ -1493,7 +1493,7 @@ int cli_NetPrintQEnum(struct cli_state *cli,
for (j=0;j<jobcount;j++) {
uint16 jid, pos, fsstatus;
pstring ownername, notifyname, datatype, jparms, jstatus, jcomment;
uint submitted, jsize;
unsigned int submitted, jsize;
GETWORD(p, jid);
GETSTRINGF(p, ownername, RAP_USERNAME_LEN);
@ -1594,7 +1594,7 @@ int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
for (j=0;(j<jobcount)&&(PTR_DIFF(p,rdata)< rsize);j++) {
uint16 jid, pos, fsstatus;
pstring ownername, notifyname, datatype, jparms, jstatus, jcomment;
uint submitted, jsize;
unsigned int submitted, jsize;
GETWORD(p, jid);
GETSTRINGF(p, ownername, RAP_USERNAME_LEN);
@ -1740,7 +1740,7 @@ int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16,
for (i=0,p=rdata;i<count;i++) {
pstring wsname, username, clitype_name;
uint16 num_conns, num_opens, num_users;
uint sess_time, idle_time, user_flags;
unsigned int sess_time, idle_time, user_flags;
GETSTRINGP(p, wsname, rdata, converter);
GETSTRINGP(p, username, rdata, converter);
@ -1813,7 +1813,7 @@ int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation, void (
int rsize, converter;
pstring wsname, username, clitype_name;
uint16 num_conns, num_opens, num_users;
uint sess_time, idle_time, user_flags;
unsigned int sess_time, idle_time, user_flags;
p = rparam + WORDSIZE;
GETWORD(p, converter);
@ -1935,7 +1935,7 @@ int cli_NetConnectionEnum(struct cli_state *cli, const char *qualifier, void (*f
for (i=0,p=rdata;i<count;i++) {
pstring netname, username;
uint16 conn_id, conn_type, num_opens, num_users;
uint conn_time;
unsigned int conn_time;
GETWORD(p,conn_id);
GETWORD(p,conn_type);

2
source/smbd/lanman.c
View File

@ -1670,7 +1670,7 @@ static BOOL api_RNetShareAdd(connection_struct *conn,uint16 vuid, char *param,ch
fstring comment;
pstring pathname;
char *command, *cmdname;
uint offset;
unsigned int offset;
int snum;
int res = ERRunsup;

2
source/smbd/trans2.c
View File

@ -375,7 +375,7 @@ static uint32 unix_dev_minor(SMB_DEV_T dev)
static uint32 unix_perms_to_wire(mode_t perms)
{
uint ret = 0;
unsigned int ret = 0;
ret |= ((perms & S_IXOTH) ? UNIX_X_OTH : 0);
ret |= ((perms & S_IWOTH) ? UNIX_W_OTH : 0);

2
source/utils/net_rap.c
View File

@ -494,7 +494,7 @@ static void enum_queue(const char *queuename, uint16 pri, uint16 start,
static void enum_jobs(uint16 jobid, const char *ownername,
const char *notifyname, const char *datatype,
const char *jparms, uint16 pos, uint16 status,
const char *jstatus, uint submitted, uint jobsize,
const char *jstatus, unsigned int submitted, unsigned int jobsize,
const char *comment)
{
d_printf(" %-23.23s %5d %9d ",