signed / unsigned issues spotted by herb

(This used to be commit 0b90442021aa3adb5ae7f09c53c9e54c7655d8c5)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index dec428a1421b0165e98da1f293e030b815958bfa..2d64d8df4575ee56c742261028513fcdb271a271 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -73,7 +73,7 @@ void add_char_string(char *s);
 /*The following definitions come from  lib/crc32.c  */
 
 void crc32_build_table(void);
-uint32 crc32_calc_buffer( uint32 count, uchar *buffer);
+uint32 crc32_calc_buffer( uint32 count, char *buffer);
 
 /*The following definitions come from  lib/debug.c  */
 

diff --git a/source3/lib/crc32.c b/source3/lib/crc32.c
index cb8bcde9097d00e66bde24b5710656c8ebe07fe1..7d0b6e350d33331f13d2628fffcaa9813b11f202 100644 (file)
--- a/source3/lib/crc32.c
+++ b/source3/lib/crc32.c
@@ -51,9 +51,9 @@ void crc32_build_table(void)
  table lookup method. 
  *****************************************************************/
 
-uint32 crc32_calc_buffer( uint32 count, uchar *buffer)
+uint32 crc32_calc_buffer( uint32 count, char *buffer)
 {
-       uchar *p;
+       char *p;
        uint32 crc;
 
        p = buffer;

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 732161ad82270398537566698e5794c52ee946d4..d21840ec46b06221f0a12dba29033440776ff0b5 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -519,7 +519,7 @@ BOOL rpc_api_pipe_req(struct cli_state *cli, uint8 op_num,
        if (auth_seal)
        {
                crc32 = crc32_calc_buffer(data->offset, mem_data(&data->data, 0));
-               NTLMSSPcalc(cli->ntlmssp_hash, mem_data(&data->data, 0), data->offset);
+               NTLMSSPcalc(cli->ntlmssp_hash, (uchar*)mem_data(&data->data, 0), data->offset);
        }
 
        if (auth_verify)
@@ -532,7 +532,7 @@ BOOL rpc_api_pipe_req(struct cli_state *cli, uint8 op_num,
 
                make_rpc_auth_ntlmssp_chk(&chk, NTLMSSP_SIGN_VERSION, crc32, 0);
                smb_io_rpc_auth_ntlmssp_chk("auth_sign", &chk, &auth_verf, 0);
-               NTLMSSPcalc(cli->ntlmssp_hash, mem_data(&auth_verf.data, 4), 12);
+               NTLMSSPcalc(cli->ntlmssp_hash, (uchar*)mem_data(&auth_verf.data, 4), 12);
        }
 
        if (auth_seal || auth_verify)

diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index 213d6945094b15bb220df54d9265f676610ab427..6b4deb00cf1345a65510e44912e2769380b3392c 100644 (file)
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -746,12 +746,12 @@ void smb_io_rpc_auth_ntlmssp_resp(char *desc, RPC_AUTH_NTLMSSP_RESP *rsp, prs_st
 
                prs_uint32("neg_flags", ps, depth, &(rsp->neg_flags)); /* 0x0000 82b1 */
 
-               prs_uint8s(True , "domain  ", ps, depth, rsp->domain  , MIN(rsp->hdr_domain  .str_str_len, sizeof(rsp->domain  ))); 
-               prs_uint8s(True , "user    ", ps, depth, rsp->user    , MIN(rsp->hdr_usr     .str_str_len, sizeof(rsp->user    ))); 
-               prs_uint8s(True , "wks     ", ps, depth, rsp->wks     , MIN(rsp->hdr_wks     .str_str_len, sizeof(rsp->wks     ))); 
-               prs_uint8s(False, "lm_resp ", ps, depth, rsp->lm_resp , MIN(rsp->hdr_lm_resp .str_str_len, sizeof(rsp->lm_resp ))); 
-               prs_uint8s(False, "nt_resp ", ps, depth, rsp->nt_resp , MIN(rsp->hdr_nt_resp .str_str_len, sizeof(rsp->nt_resp ))); 
-               prs_uint8s(False, "sess_key", ps, depth, rsp->sess_key, MIN(rsp->hdr_sess_key.str_str_len, sizeof(rsp->sess_key))); 
+               prs_uint8s(True , "domain  ", ps, depth, (uint8*)rsp->domain  , MIN(rsp->hdr_domain  .str_str_len, sizeof(rsp->domain  ))); 
+               prs_uint8s(True , "user    ", ps, depth, (uint8*)rsp->user    , MIN(rsp->hdr_usr     .str_str_len, sizeof(rsp->user    ))); 
+               prs_uint8s(True , "wks     ", ps, depth, (uint8*)rsp->wks     , MIN(rsp->hdr_wks     .str_str_len, sizeof(rsp->wks     ))); 
+               prs_uint8s(False, "lm_resp ", ps, depth, (uint8*)rsp->lm_resp , MIN(rsp->hdr_lm_resp .str_str_len, sizeof(rsp->lm_resp ))); 
+               prs_uint8s(False, "nt_resp ", ps, depth, (uint8*)rsp->nt_resp , MIN(rsp->hdr_nt_resp .str_str_len, sizeof(rsp->nt_resp ))); 
+               prs_uint8s(False, "sess_key", ps, depth, (uint8*)rsp->sess_key, MIN(rsp->hdr_sess_key.str_str_len, sizeof(rsp->sess_key))); 
        }
 }