diff options
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/cli_samr.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/cliconnect.c | 8 | ||||
| -rw-r--r-- | source3/libsmb/clifile.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clirap2.c | 10 |
4 files changed, 15 insertions, 7 deletions
diff --git a/source3/libsmb/cli_samr.c b/source3/libsmb/cli_samr.c index dfc4ccf706..91577b3325 100644 --- a/source3/libsmb/cli_samr.c +++ b/source3/libsmb/cli_samr.c @@ -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); diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 893d194a87..cc9821dc29 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -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; diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 05843ac5de..a47c956a55 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -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); diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c index 00cd4b15f3..9c3ec212d5 100644 --- a/source3/libsmb/clirap2.c +++ b/source3/libsmb/clirap2.c @@ -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); |