get rid of some sompiler warnings on IRIX

(This used to be commit a6a39c61e8228c8b3b7552ab3c61ec3a6a639143)

diff --git a/source3/lib/access.c b/source3/lib/access.c
index c30b3c33cc2867897c659b1ade86933c4d522682..a874c8b1e2065e01a06c898ff4510bfbd85a5192 100644 (file)
--- a/source3/lib/access.c
+++ b/source3/lib/access.c
@@ -281,13 +281,12 @@ static BOOL only_ipaddrs_in_list(const char** list)
                }
                
                if (!is_ipaddress(*list)) {
-                       char *p;
                        /* 
                         * if we failed, make sure that it was not because the token
                         * was a network/netmask pair.  Only network/netmask pairs
                         * have a '/' in them
                         */
-                       if ((p=strchr_m(*list, '/')) == NULL) {
+                       if ((strchr_m(*list, '/')) == NULL) {
                                only_ip = False;
                                DEBUG(3,("only_ipaddrs_in_list: list has non-ip address (%s)\n", *list));
                                break;

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index a18852a691f8512e92524a97d722c02c60b449e4..7e1801f5551304c4a9c9811984adfa25bab0566e 100644 (file)
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -74,7 +74,7 @@
 {
        pkaddr->addrtype = ADDRTYPE_INET;
        pkaddr->length = sizeof(((struct sockaddr_in *)paddr)->sin_addr);
-       pkaddr->contents = (char *)&(((struct sockaddr_in *)paddr)->sin_addr);
+       pkaddr->contents = (krb5_octet *)&(((struct sockaddr_in *)paddr)->sin_addr);
 }
 #else
  __ERROR__XX__UNKNOWN_ADDRTYPE

diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index f302c045a5d51537d2b18a70a151dfad666100fd..2fb0e59acacc3a8fa457a9eca21793da86032a30 100644 (file)
--- a/source3/libsmb/cliprint.c
+++ b/source3/libsmb/cliprint.c
@@ -55,7 +55,7 @@ int cli_print_queue(struct cli_state *cli,
        char *rparam = NULL;
        char *rdata = NULL;
        char *p;
-       int rdrcnt, rprcnt;
+       unsigned int rdrcnt, rprcnt;
        pstring param;
        int result_code=0;
        int i = -1;
@@ -125,7 +125,8 @@ int cli_printjob_del(struct cli_state *cli, int job)
        char *rparam = NULL;
        char *rdata = NULL;
        char *p;
-       int rdrcnt,rprcnt, ret = -1;
+       unsigned int rdrcnt,rprcnt;
+       int ret = -1;
        pstring param;
 
        memset(param,'\0',sizeof(param));

diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index a307ac6ccf8f90bf7c3a9bc1ec8f619864187a7a..79ad38fc8c34a59d9912a606390631a064dfe3e5 100644 (file)
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -76,7 +76,7 @@ BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation)
        char *rparam = NULL;
        char *rdata = NULL;
        char *p;
-       int rdrcnt,rprcnt;
+       unsigned int rdrcnt,rprcnt;
        pstring param;
 
        memset(param, 0, sizeof(param));
@@ -137,7 +137,7 @@ int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, co
        char *rparam = NULL;
        char *rdata = NULL;
        char *p;
-       int rdrcnt,rprcnt;
+       unsigned int rdrcnt,rprcnt;
        pstring param;
        int count = -1;
 
@@ -211,7 +211,7 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
 {
        char *rparam = NULL;
        char *rdata = NULL;
-       int rdrcnt,rprcnt;
+       unsigned int rdrcnt,rprcnt;
        char *p;
        pstring param;
        int uLevel = 1;
@@ -256,7 +256,7 @@ BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
                                const char *cmnt = comment_offset?(rdata+comment_offset):"";
                                pstring s1, s2;
 
-                               if (comment_offset < 0 || comment_offset > rdrcnt) continue;
+                               if (comment_offset < 0 || comment_offset > (int)rdrcnt) continue;
 
                                stype = IVAL(p,18) & ~SV_TYPE_LOCAL_LIST_ONLY;
 
@@ -290,7 +290,7 @@ BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char
   unsigned int param_len = 0;
   char *rparam = NULL;
   char *rdata = NULL;
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   pstring dos_new_password;
 
   if (strlen(user) >= sizeof(fstring)-1) {

diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index 669b33860dae88d8ce9f4620d471ab67edabfc99..12a3d63aff35542b1e81fe621e9434509cda9836 100644 (file)
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -153,7 +153,8 @@ int cli_NetGroupDelete(struct cli_state *cli, const char *group_name )
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt, res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                    /* api number    */
            +sizeof(RAP_NetGroupDel_REQ) /* parm string   */
            +1                           /* no ret string */
@@ -204,7 +205,8 @@ int cli_NetGroupAdd(struct cli_state *cli, RAP_GROUP_INFO_1 * grinfo )
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt,res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                    /* api number    */
            +sizeof(RAP_NetGroupAdd_REQ) /* req string    */
            +sizeof(RAP_GROUP_INFO_L1)   /* return string */
@@ -272,7 +274,7 @@ int cli_RNetGroupEnum(struct cli_state *cli, void (*fn)(const char *, const char
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
   
   
@@ -332,7 +334,8 @@ int cli_NetGroupDelUser(struct cli_state * cli, const char *group_name, const ch
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt,res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                        /* api number    */
            +sizeof(RAP_NetGroupDelUser_REQ) /* parm string   */
            +1                               /* no ret string */
@@ -390,7 +393,8 @@ int cli_NetGroupAddUser(struct cli_state * cli, const char *group_name, const ch
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt,res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                        /* api number    */
            +sizeof(RAP_NetGroupAddUser_REQ) /* parm string   */
            +1                               /* no ret string */
@@ -446,7 +450,7 @@ int cli_NetGroupGetUsers(struct cli_state * cli, const char *group_name, void (*
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   int res = -1;
   char param[WORDSIZE                        /* api number    */
            +sizeof(RAP_NetGroupGetUsers_REQ)/* parm string   */
@@ -501,7 +505,7 @@ int cli_NetUserGetGroups(struct cli_state * cli, const char *user_name, void (*f
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   int res = -1;
   char param[WORDSIZE                        /* api number    */
            +sizeof(RAP_NetUserGetGroups_REQ)/* parm string   */
@@ -560,7 +564,8 @@ int cli_NetUserDelete(struct cli_state *cli, const char * user_name )
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt, res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                    /* api number    */
            +sizeof(RAP_NetGroupDel_REQ) /* parm string   */
            +1                           /* no ret string */
@@ -614,7 +619,8 @@ int cli_NetUserAdd(struct cli_state *cli, RAP_USER_INFO_1 * userinfo )
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;                                          
-  int rdrcnt,rprcnt,res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                    /* api number    */
            +sizeof(RAP_NetUserAdd2_REQ) /* req string    */
            +sizeof(RAP_USER_INFO_L1)    /* data string   */
@@ -702,7 +708,7 @@ int cli_RNetUserEnum(struct cli_state *cli, void (*fn)(const char *, const char
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
   
 
@@ -770,7 +776,7 @@ int cli_NetFileClose(struct cli_state *cli, uint32 file_id )
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   char param[WORDSIZE                    /* api number    */
            +sizeof(RAP_WFileClose2_REQ) /* req string    */
            +1                           /* no ret string */
@@ -816,7 +822,8 @@ int cli_NetFileGetInfo(struct cli_state *cli, uint32 file_id, void (*fn)(const c
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt, res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                      /* api number      */
            +sizeof(RAP_WFileGetInfo2_REQ) /* req string      */
            +sizeof(RAP_FILE_INFO_L3)      /* return string   */
@@ -893,7 +900,7 @@ int cli_NetFileEnum(struct cli_state *cli, char * user, char * base_path, void (
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   char param[WORDSIZE                   /* api number      */
            +sizeof(RAP_WFileEnum2_REQ) /* req string      */
            +sizeof(RAP_FILE_INFO_L3)   /* return string   */
@@ -965,7 +972,8 @@ int cli_NetShareAdd(struct cli_state *cli, RAP_SHARE_INFO_2 * sinfo )
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt,res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                  /* api number    */
            +sizeof(RAP_WShareAdd_REQ) /* req string    */
            +sizeof(RAP_SHARE_INFO_L2) /* return string */
@@ -1035,7 +1043,8 @@ int cli_NetShareDelete(struct cli_state *cli, const char * share_name )
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt, res;
+  unsigned int rdrcnt,rprcnt;
+  int res;
   char param[WORDSIZE                  /* api number    */
            +sizeof(RAP_WShareDel_REQ) /* req string    */
            +1                         /* no ret string */
@@ -1097,7 +1106,7 @@ BOOL cli_get_pdc_name(struct cli_state *cli, char *workgroup, char *pdc_name)
 {
   char *rparam = NULL;
   char *rdata = NULL;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   char *p;
   char param[WORDSIZE                       /* api number    */
            +sizeof(RAP_NetServerEnum2_REQ) /* req string    */
@@ -1177,7 +1186,7 @@ BOOL cli_get_server_domain(struct cli_state *cli)
 {
   char *rparam = NULL;
   char *rdata = NULL;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   char *p;
   char param[WORDSIZE                      /* api number    */
            +sizeof(RAP_WWkstaGetInfo_REQ) /* req string    */
@@ -1242,7 +1251,7 @@ BOOL cli_get_server_type(struct cli_state *cli, uint32 *pstype)
 {
   char *rparam = NULL;
   char *rdata = NULL;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   char *p;
   char param[WORDSIZE                       /* api number    */
            +sizeof(RAP_WserverGetInfo_REQ) /* req string    */
@@ -1309,7 +1318,7 @@ BOOL cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 sty
 {
   char *rparam = NULL;
   char *rdata = NULL;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   char *p;
   char param[WORDSIZE                       /* api number    */
            +sizeof(RAP_NetServerEnum2_REQ) /* req string    */
@@ -1378,7 +1387,7 @@ BOOL cli_NetWkstaUserLogoff(struct cli_state *cli,char *user, char *workstation)
   char *rparam = NULL;
   char *rdata = NULL;
   char *p;
-  int rdrcnt,rprcnt;
+  unsigned int rdrcnt,rprcnt;
   char param[WORDSIZE                           /* api number    */
            +sizeof(RAP_NetWkstaUserLogoff_REQ) /* req string    */
            +sizeof(RAP_USER_LOGOFF_INFO_L1)    /* return string */
@@ -1436,7 +1445,7 @@ int cli_NetPrintQEnum(struct cli_state *cli,
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
   
 
@@ -1540,7 +1549,7 @@ int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
   
 
@@ -1639,7 +1648,7 @@ int cli_RNetServiceEnum(struct cli_state *cli, void (*fn)(const char *, const ch
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
   
   
@@ -1708,7 +1717,7 @@ int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16,
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
   
   memset(param, '\0', sizeof(param));
@@ -1784,7 +1793,7 @@ int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation, void (
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
   
 
@@ -1858,7 +1867,7 @@ int cli_NetSessionDel(struct cli_state *cli, const char *workstation)
   char *p;
   char *rparam = NULL;
   char *rdata = NULL;
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res;
 
   memset(param, '\0', sizeof(param));
@@ -1903,7 +1912,7 @@ int cli_NetConnectionEnum(struct cli_state *cli, const char *qualifier, void (*f
   char *p;
   char *rparam = NULL;
   char *rdata = NULL; 
-  int rprcnt, rdrcnt;
+  unsigned int rprcnt, rdrcnt;
   int res = -1;
 
   memset(param, '\0', sizeof(param));

diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c
index d86a9022a6954f6ca2a944b919511c7bb2a13b95..548cd6ec1878033b265aa7a8d57f7a7494232f75 100644 (file)
--- a/source3/libsmb/clisecdesc.c
+++ b/source3/libsmb/clisecdesc.c
@@ -28,7 +28,7 @@ SEC_DESC *cli_query_secdesc(struct cli_state *cli, int fnum,
 {
        char param[8];
        char *rparam=NULL, *rdata=NULL;
-       int rparam_count=0, rdata_count=0;
+       unsigned int rparam_count=0, rdata_count=0;
        prs_struct pd;
        SEC_DESC *psd = NULL;
 
@@ -78,7 +78,7 @@ BOOL cli_set_secdesc(struct cli_state *cli, int fnum, SEC_DESC *sd)
 {
        char param[8];
        char *rparam=NULL, *rdata=NULL;
-       int rparam_count=0, rdata_count=0;
+       unsigned int rparam_count=0, rdata_count=0;
        uint32 sec_info = 0;
        TALLOC_CTX *mem_ctx;
        prs_struct pd;

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 43c3464bd2403cacea0183f39f003edb3626c974..e4d4acd29b041a99f5f69b7f08efd8f449729e4c 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -146,7 +146,7 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
                                 &cliname,
                                 &domname)) {
                        DEBUG(1, ("ntlmssp_server_negotiate: failed to parse NTLMSSP:\n"));
-                       dump_data(2, request.data, request.length);
+                       dump_data(2, (const char *)request.data, request.length);
                        return NT_STATUS_INVALID_PARAMETER;
                }
                
@@ -282,7 +282,7 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
                         &sess_key,
                         &neg_flags)) {
                DEBUG(1, ("ntlmssp_server_auth: failed to parse NTLMSSP:\n"));
-               dump_data(2, request.data, request.length);
+               dump_data(2, (const char *)request.data, request.length);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
@@ -476,7 +476,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
                         &server_domain_blob,
                         &chal_flags)) {
                DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#1)\n"));
-               dump_data(2, reply.data, reply.length);
+               dump_data(2, (const char *)reply.data, reply.length);
 
                return NT_STATUS_INVALID_PARAMETER;
        }
@@ -538,7 +538,7 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_client_state *ntlmssp_st
                         &unkn1, &unkn2,
                         &struct_blob)) {
                DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#2)\n"));
-               dump_data(2, reply.data, reply.length);
+               dump_data(2, (const char *)reply.data, reply.length);
                return NT_STATUS_INVALID_PARAMETER;
        }
 

diff --git a/source3/libsmb/ntlmssp_sign.c b/source3/libsmb/ntlmssp_sign.c
index ecaef808c9b553d720992d33788a7915c7ff3d81..ff2f97c2e888048a6545e8195d93047c747d383d 100644 (file)
--- a/source3/libsmb/ntlmssp_sign.c
+++ b/source3/libsmb/ntlmssp_sign.c
@@ -91,8 +91,8 @@ static void calc_ntlmv2_hash(unsigned char hash[16], char digest[16],
 
        MD5Init(&ctx3);
        MD5Update(&ctx3, session_key.data, session_key.length);
-       MD5Update(&ctx3, constant, strlen(constant));
-       MD5Final(digest, &ctx3);
+       MD5Update(&ctx3, (const unsigned char *)constant, strlen(constant));
+       MD5Final((unsigned char *)digest, &ctx3);
 
        calc_hash(hash, digest, 16);
 }
@@ -113,8 +113,8 @@ static NTSTATUS ntlmssp_make_packet_signature(NTLMSSP_CLIENT_STATE *ntlmssp_stat
                uchar digest[16];
                SIVAL(seq_num, 0, ntlmssp_state->ntlmssp_seq_num);
 
-               hmac_md5_init_limK_to_64(ntlmssp_state->cli_sign_const, 16, &ctx);
-               hmac_md5_update(seq_num, 4, &ctx);
+               hmac_md5_init_limK_to_64((const unsigned char *)(ntlmssp_state->cli_sign_const), 16, &ctx);
+               hmac_md5_update((const unsigned char *)seq_num, 4, &ctx);
                hmac_md5_update(data, length, &ctx);
                hmac_md5_final(digest, &ctx);
 
@@ -132,7 +132,7 @@ static NTSTATUS ntlmssp_make_packet_signature(NTLMSSP_CLIENT_STATE *ntlmssp_stat
                }
        } else {
                uint32 crc;
-               crc = crc32_calc_buffer(data, length);
+               crc = crc32_calc_buffer((const char *)data, length);
                if (!msrpc_gen(sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, ntlmssp_state->ntlmssp_seq_num)) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -183,10 +183,10 @@ NTSTATUS ntlmssp_client_check_packet(NTLMSSP_CLIENT_STATE *ntlmssp_state,
        
        if (memcmp(sig->data+sig->length - 8, local_sig.data+local_sig.length - 8, 8) != 0) {
                DEBUG(5, ("BAD SIG: wanted signature of\n"));
-               dump_data(5, local_sig.data, local_sig.length);
+               dump_data(5, (const char *)local_sig.data, local_sig.length);
                
                DEBUG(5, ("BAD SIG: got signature of\n"));
-               dump_data(5, sig->data, sig->length);
+               dump_data(5, (const char *)(sig->data), sig->length);
 
                DEBUG(0, ("NTLMSSP packet check failed due to invalid signature!\n"));
                return NT_STATUS_ACCESS_DENIED;
@@ -216,8 +216,8 @@ NTSTATUS ntlmssp_client_seal_packet(NTLMSSP_CLIENT_STATE *ntlmssp_state,
                uchar digest[16];
                SIVAL(seq_num, 0, ntlmssp_state->ntlmssp_seq_num);
 
-               hmac_md5_init_limK_to_64(ntlmssp_state->cli_sign_const, 16, &ctx);
-               hmac_md5_update(seq_num, 4, &ctx);
+               hmac_md5_init_limK_to_64((const unsigned char *)(ntlmssp_state->cli_sign_const), 16, &ctx);
+               hmac_md5_update((const unsigned char *)seq_num, 4, &ctx);
                hmac_md5_update(data, length, &ctx);
                hmac_md5_final(digest, &ctx);
 
@@ -236,7 +236,7 @@ NTSTATUS ntlmssp_client_seal_packet(NTLMSSP_CLIENT_STATE *ntlmssp_state,
                NTLMSSPcalc_ap(ntlmssp_state->cli_sign_hash,  sig->data+4, sig->length-4);
        } else {
                uint32 crc;
-               crc = crc32_calc_buffer(data, length);
+               crc = crc32_calc_buffer((const char *)data, length);
                if (!msrpc_gen(sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, ntlmssp_state->ntlmssp_seq_num)) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -335,7 +335,7 @@ NTSTATUS ntlmssp_client_sign_init(NTLMSSP_CLIENT_STATE *ntlmssp_state)
                
                DEBUG(5, ("NTLMSSP Sign/Seal - using LM KEY\n"));
 
-               calc_hash(ntlmssp_state->ntlmssp_hash, ntlmssp_state->session_key.data, 8);
+               calc_hash(ntlmssp_state->ntlmssp_hash, (const char *)(ntlmssp_state->session_key.data), 8);
                dump_data_pw("NTLMSSP hash:\n", ntlmssp_state->ntlmssp_hash,
                             sizeof(ntlmssp_state->ntlmssp_hash));
        } else {
@@ -347,7 +347,7 @@ NTSTATUS ntlmssp_client_sign_init(NTLMSSP_CLIENT_STATE *ntlmssp_state)
                
                DEBUG(5, ("NTLMSSP Sign/Seal - using NT KEY\n"));
 
-               calc_hash(ntlmssp_state->ntlmssp_hash, ntlmssp_state->session_key.data, 16);
+               calc_hash(ntlmssp_state->ntlmssp_hash, (const char *)(ntlmssp_state->session_key.data), 16);
                dump_data_pw("NTLMSSP hash:\n", ntlmssp_state->ntlmssp_hash,
                             sizeof(ntlmssp_state->ntlmssp_hash));
        }

diff --git a/source3/modules/getdate.c b/source3/modules/getdate.c
index 182a036b4b9a5307465858c2bbe636166e13f795..491c51294e9ca0e68704250b126865671c7229e8 100644 (file)
--- a/source3/modules/getdate.c
+++ b/source3/modules/getdate.c
@@ -1993,6 +1993,7 @@ to_hour (int hours, int meridian)
       abort ();
     }
   /* NOTREACHED */
+    return 0;
 }
 
 static int

diff --git a/source3/modules/getdate.y b/source3/modules/getdate.y
index 355500b3e13e17c2842127e3fa92f10249c95040..aab37f4d23554163fcab0c5de345af340d58c9ee 100644 (file)
--- a/source3/modules/getdate.y
+++ b/source3/modules/getdate.y
@@ -650,6 +650,7 @@ to_hour (int hours, int meridian)
       abort ();
     }
   /* NOTREACHED */
+    return 0;
 }
 
 static int

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 8e775ed87fc5bfa6052640a79c7f555640ed7690..34a5f7e32aab3fe9e752643f77db7050a13666b0 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -1315,7 +1315,7 @@ BOOL init_sam_from_buffer(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
        }
                                                                        
        /* unpack the buffer into variables */
-       len = tdb_unpack (buf, buflen, TDB_FORMAT_STRING,
+       len = tdb_unpack ((char *)buf, buflen, TDB_FORMAT_STRING,
                &logon_time,
                &logoff_time,
                &kickoff_time,
@@ -1658,7 +1658,7 @@ uint32 init_buffer_from_sam (uint8 **buf, const SAM_ACCOUNT *sampass, BOOL size_
        }
        
        /* now for the real call to tdb_pack() */
-       buflen = tdb_pack(*buf, len,  TDB_FORMAT_STRING,
+       buflen = tdb_pack((char *)*buf, len,  TDB_FORMAT_STRING,
                logon_time,
                logoff_time,
                kickoff_time,

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index d458267b08b6a9f50ccc55fcda41e1d7ce869b00..66c4133c4a9365864e944c60b802dec0899f7c4d 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1694,7 +1694,7 @@ static BOOL init_group_from_ldap(struct ldapsam_privates *ldap_state,
                        get_attr_key2string( groupmap_attr_list, LDAP_ATTR_GROUP_TYPE)));
                return False;
        }
-       map->sid_name_use = (uint32)atol(temp);
+       map->sid_name_use = (enum SID_NAME_USE)atol(temp);
 
        if ((map->sid_name_use < SID_NAME_USER) ||
            (map->sid_name_use > SID_NAME_UNKNOWN)) {
@@ -2137,7 +2137,6 @@ static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods,
        GROUP_MAP map;
        GROUP_MAP *mapt;
        int entries = 0;
-       NTSTATUS nt_status;
 
        *num_entries = 0;
        *rmap = NULL;
@@ -2147,7 +2146,7 @@ static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       while (NT_STATUS_IS_OK(nt_status = ldapsam_getsamgrent(methods, &map))) {
+       while (NT_STATUS_IS_OK(ldapsam_getsamgrent(methods, &map))) {
                if (sid_name_use != SID_NAME_UNKNOWN &&
                    sid_name_use != map.sid_name_use) {
                        DEBUG(11,("enum_group_mapping: group %s is not of the requested type\n", map.nt_name));

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 7c2156455aa713a953a878232ed3e0fa4eff395f..c9a84f3242c2e06a69031101ca604c66d025e846 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -133,7 +133,7 @@ static NTSTATUS tdbsam_getsampwent(struct pdb_methods *my_methods, SAM_ACCOUNT *
        }
   
        /* unpack the buffer */
-       if (!init_sam_from_buffer(user, data.dptr, data.dsize)) {
+       if (!init_sam_from_buffer(user, (unsigned char *)data.dptr, data.dsize)) {
                DEBUG(0,("pdb_getsampwent: Bad SAM_ACCOUNT entry returned from TDB!\n"));
                SAFE_FREE(data.dptr);
                return nt_status;
@@ -213,7 +213,7 @@ static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, SAM_ACCOUNT
        }
   
        /* unpack the buffer */
-       if (!init_sam_from_buffer(user, data.dptr, data.dsize)) {
+       if (!init_sam_from_buffer(user, (unsigned char *)data.dptr, data.dsize)) {
                DEBUG(0,("pdb_getsampwent: Bad SAM_ACCOUNT entry returned from TDB!\n"));
                SAFE_FREE(data.dptr);
                tdb_close(pwd_tdb);
@@ -390,7 +390,7 @@ static BOOL tdb_update_sam(struct pdb_methods *my_methods, SAM_ACCOUNT* newpwd,
                ret = False;
                goto done;
        }
-       data.dptr = buf;
+       data.dptr = (char *)buf;
 
        fstrcpy(name, pdb_get_username(newpwd));
        strlower_m(name);

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 23413e4026c45601b0c656e309adfb9113935aad..2c99631e1303f3f998aa607b0ffdb02caad80ee7 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -58,7 +58,7 @@ void *secrets_fetch(const char *key, size_t *size)
        secrets_init();
        if (!tdb)
                return NULL;
-       kbuf.dptr = key;
+       kbuf.dptr = (char *)key;
        kbuf.dsize = strlen(key);
        dbuf = tdb_fetch(tdb, kbuf);
        if (size)
@@ -74,9 +74,9 @@ BOOL secrets_store(const char *key, const void *data, size_t size)
        secrets_init();
        if (!tdb)
                return False;
-       kbuf.dptr = key;
+       kbuf.dptr = (char *)key;
        kbuf.dsize = strlen(key);
-       dbuf.dptr = data;
+       dbuf.dptr = (char *)data;
        dbuf.dsize = size;
        return tdb_store(tdb, kbuf, dbuf, TDB_REPLACE) == 0;
 }
@@ -90,7 +90,7 @@ BOOL secrets_delete(const char *key)
        secrets_init();
        if (!tdb)
                return False;
-       kbuf.dptr = key;
+       kbuf.dptr = (char *)key;
        kbuf.dsize = strlen(key);
        return tdb_delete(tdb, kbuf) == 0;
 }

diff --git a/source3/rpc_parse/parse_echo.c b/source3/rpc_parse/parse_echo.c
index 67f9ad772eec7091a079354170bbe3de6c0bfa73..4b1ff1f4d545d35811dca7645fdebc02c95a0160 100644 (file)
--- a/source3/rpc_parse/parse_echo.c
+++ b/source3/rpc_parse/parse_echo.c
@@ -73,7 +73,7 @@ BOOL echo_io_q_echo_data(const char *desc, ECHO_Q_ECHO_DATA *q_d,
                        return False;
        }
 
-       if (!prs_uint8s(False, "data", ps, depth, q_d->data, q_d->size))
+       if (!prs_uint8s(False, "data", ps, depth, (unsigned char *)q_d->data, q_d->size))
                return False;
 
        return True;
@@ -92,7 +92,7 @@ BOOL echo_io_r_echo_data(const char *desc, ECHO_R_ECHO_DATA *q_d,
                        return False;
        }
 
-       if (!prs_uint8s(False, "data", ps, depth, q_d->data, q_d->size))
+       if (!prs_uint8s(False, "data", ps, depth, (unsigned char *)q_d->data, q_d->size))
                return False;
 
        return True;
@@ -120,7 +120,7 @@ BOOL echo_io_q_sink_data(const char *desc, ECHO_Q_SINK_DATA *q_d,
                        return False;
        }
 
-       if (!prs_uint8s(False, "data", ps, depth, q_d->data, q_d->size))
+       if (!prs_uint8s(False, "data", ps, depth, (unsigned char *)q_d->data, q_d->size))
                return False;
 
        return True;
@@ -159,7 +159,7 @@ BOOL echo_io_r_source_data(const char *desc, ECHO_R_SOURCE_DATA *q_d,
                        return False;
        }
 
-       if (!prs_uint8s(False, "data", ps, depth, q_d->data, q_d->size))
+       if (!prs_uint8s(False, "data", ps, depth, (unsigned char *)q_d->data, q_d->size))
                return False;
 
        return True;

diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index 804da707dedc4f01dd422091656860670de5e8c6..252e690723a24f73a87cbeadcbb8895bd22556d2 100644 (file)
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -801,7 +801,7 @@ void init_q_srv_pwset(NET_Q_SRV_PWSET *q_s,
        DEBUG(5,("init_q_srv_pwset\n"));
        
        /* Process the new password. */
-       cred_hash3( nt_cypher, hashed_mach_pwd, sess_key, 1);
+       cred_hash3( nt_cypher, hashed_mach_pwd, (const unsigned char *)sess_key, 1);
 
        init_clnt_info(&q_s->clnt_id, logon_srv, acct_name, sec_chan, comp_name, cred);
 

diff --git a/source3/rpc_parse/parse_reg.c b/source3/rpc_parse/parse_reg.c
index b4d20bf2baa32b66d4e6ffd96fce217ef388f254..bbf6e6a8e3de9cd5c9e20278951f19ffea0f70e9 100644 (file)
--- a/source3/rpc_parse/parse_reg.c
+++ b/source3/rpc_parse/parse_reg.c
@@ -40,7 +40,7 @@ static uint32 reg_init_buffer2( BUFFER2 *buf2, REGISTRY_VALUE *val )
                return 0;
                
        real_size = regval_size(val);
-       init_buffer2( buf2, (char*)regval_data_p(val), real_size );
+       init_buffer2( buf2, (unsigned char*)regval_data_p(val), real_size );
 
        return real_size;
 }

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 1a380c64d556502c9f48cc4be0caa5ebf93169f1..7ca9bccab461625e583936dd6fca2bd3dfecf13c 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1368,7 +1368,7 @@ BOOL spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u,
                return False;
        
        if (UNMARSHALLING(ps) && r_u->size) {
-               r_u->data = prs_alloc_mem(ps, r_u->size);
+               r_u->data = (unsigned char *)prs_alloc_mem(ps, r_u->size);
                if(!r_u->data)
                        return False;
        }
@@ -6178,7 +6178,7 @@ BOOL make_spoolss_q_setprinterdata(SPOOL_Q_SETPRINTERDATA *q_u, const POLICY_HND
        init_unistr2(&q_u->value, value, strlen(value)+1);
 
        q_u->max_len = q_u->real_len = data_size;
-       q_u->data = data;
+       q_u->data = (unsigned char *)data;
        
        return True;
 }
@@ -6195,7 +6195,7 @@ BOOL make_spoolss_q_setprinterdataex(SPOOL_Q_SETPRINTERDATAEX *q_u, const POLICY
        init_unistr2(&q_u->key, key, strlen(key)+1);
 
        q_u->max_len = q_u->real_len = data_size;
-       q_u->data = data;
+       q_u->data = (unsigned char *)data;
        
        return True;
 }
@@ -6990,7 +6990,7 @@ BOOL spoolss_io_r_getprinterdataex(const char *desc, SPOOL_R_GETPRINTERDATAEX *r
                return False;
        
        if (UNMARSHALLING(ps) && r_u->size) {
-               r_u->data = prs_alloc_mem(ps, r_u->size);
+               r_u->data = (unsigned char *)prs_alloc_mem(ps, r_u->size);
                if(!r_u->data)
                        return False;
        }
@@ -7689,7 +7689,7 @@ BOOL make_spoolss_q_writeprinter(SPOOL_Q_WRITEPRINTER *q_u,
 {
         memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
        q_u->buffer_size = q_u->buffer_size2 = data_size;
-       q_u->buffer = data;
+       q_u->buffer = (unsigned char *)data;
        return True;
 }
 

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 9eafcb8dc356c8192f035053888ce2f61dfa5af1..330dd727efd4492839cae3211c690a9b66ca2b5d 100644 (file)
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -502,7 +502,7 @@ NTSTATUS _lsa_enum_trust_dom(pipes_struct *p, LSA_Q_ENUM_TRUST_DOM *q_u, LSA_R_E
        if (!(info->access & POLICY_VIEW_LOCAL_INFORMATION))
                return NT_STATUS_ACCESS_DENIED;
 
-       nt_status = secrets_get_trusted_domains(p->mem_ctx, &enum_context, max_num_domains, &num_domains, &trust_doms);
+       nt_status = secrets_get_trusted_domains(p->mem_ctx, (int *)&enum_context, max_num_domains, (int *)&num_domains, &trust_doms);
 
        if (!NT_STATUS_IS_OK(nt_status) &&
            !NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES) &&

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index ae6337e1526ebe98b80ca2a0c0cebd61c376d022..d1fb587d748a4368067a37ae5ff3ff28e92f977b 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1226,10 +1226,10 @@ BOOL api_pipe_auth_process(pipes_struct *p, prs_struct *rpc_in)
                             sizeof(p->ntlmssp_hash));
 
                dump_data_pw("Incoming RPC PDU (NTLMSSP sealed)\n", 
-                            data, data_len);
+                            (const unsigned char *)data, data_len);
                NTLMSSPcalc_p(p, (uchar*)data, data_len);
                dump_data_pw("Incoming RPC PDU (NTLMSSP unsealed)\n", 
-                            data, data_len);
+                            (const unsigned char *)data, data_len);
                crc32 = crc32_calc_buffer(data, data_len);
        }
 

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 5f44acc9623a7da598b4cbbcf9d68fb262de3ac0..a338b5eb4d8f02a9497b9c545e42394e042e9f05 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -913,7 +913,6 @@ static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM
        } else if (sid_equal(sid, get_global_sam_sid()) && !lp_hide_local_users()) {
                struct sys_grent *glist;
                struct sys_grent *grp;
-               struct passwd *pw;
                gid_t winbind_gid_low, winbind_gid_high;
                BOOL winbind_groups_exist = lp_idmap_gid(&winbind_gid_low, &winbind_gid_high);
 
@@ -952,7 +951,7 @@ static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM
 
                        /* Don't return user private groups... */
 
-                       if ((pw = Get_Pwnam(smap.nt_name)) != 0) {
+                       if (Get_Pwnam(smap.nt_name) != 0) {
                                DEBUG(10,("get_group_alias_entries: not returing %s, clashes with user.\n", smap.nt_name ));
                                continue;                       
                        }
@@ -2145,7 +2144,7 @@ NTSTATUS _samr_query_dom_info(pipes_struct *p, SAMR_Q_QUERY_DOMAIN_INFO *q_u, SA
                                       num_users, num_groups, num_aliases);
                        break;
                case 0x03:
-                       account_policy_get(AP_TIME_TO_LOGOUT, (int *)&u_logout);
+                       account_policy_get(AP_TIME_TO_LOGOUT, (unsigned int *)&u_logout);
                        unix_to_nt_time_abs(&nt_logout, u_logout);
                        
                        init_unk_info3(&ctr->info.inf3, nt_logout);

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index edbd1562bc1168d937065d633e67cdcbd69f24ab..725672da69d5a89c7420d6da2d287d5dee0c0fa7 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -387,7 +387,6 @@ static WERROR delete_printer_handle(pipes_struct *p, POLICY_HND *hnd)
                char *cmd = lp_deleteprinter_cmd();
                pstring command;
                int ret;
-               int i;
 
                /* Printer->dev.handlename equals portname equals sharename */
                slprintf(command, sizeof(command)-1, "%s \"%s\"", cmd,
@@ -406,7 +405,7 @@ static WERROR delete_printer_handle(pipes_struct *p, POLICY_HND *hnd)
                /* go ahead and re-read the services immediately */
                reload_services( False );
 
-               if ( ( i = lp_servicenumber( Printer->dev.handlename ) ) < 0 )
+               if ( lp_servicenumber( Printer->dev.handlename )  < 0 )
                        return WERR_ACCESS_DENIED;
        }
 
@@ -957,7 +956,7 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
                SPOOL_NOTIFY_INFO_DATA *data;
                uint32  data_len = 0;
                uint32  id;
-               int     i, event_index;
+               int     i;
 
                /* Is there notification on this handle? */
 
@@ -980,8 +979,6 @@ static void send_notify2_changes( SPOOLSS_NOTIFY_MSG_CTR *ctr, uint32 idx )
                data = talloc( mem_ctx, msg_group->num_msgs*sizeof(SPOOL_NOTIFY_INFO_DATA) );
                ZERO_STRUCTP(data);
                
-               event_index = 0;
-               
                /* build the array of change notifications */
                
                sending_msg_count = 0;
@@ -3753,7 +3750,6 @@ static WERROR printserver_notify_info(pipes_struct *p, POLICY_HND *hnd,
        Printer_entry *Printer=find_printer_index_by_hnd(p, hnd);
        int n_services=lp_numservices();
        int i;
-       uint32 id;
        SPOOL_NOTIFY_OPTION *option;
        SPOOL_NOTIFY_OPTION_TYPE *option_type;
 
@@ -3763,7 +3759,6 @@ static WERROR printserver_notify_info(pipes_struct *p, POLICY_HND *hnd,
                return WERR_BADFID;
 
        option=Printer->notify.option;
-       id=1;
        info->version=2;
        info->data=NULL;
        info->count=0;
@@ -6192,12 +6187,9 @@ static WERROR publish_or_unpublish_printer(pipes_struct *p, POLICY_HND *handle,
        SPOOL_PRINTER_INFO_LEVEL_7 *info7 = info->info_7;
        int snum;
        Printer_entry *Printer = find_printer_index_by_hnd(p, handle);
-       WERROR result;
 
        DEBUG(5,("publish_or_unpublish_printer, action = %d\n",info7->action));
 
-       result = WERR_OK;
-
        if (!Printer)
                return WERR_BADFID;
 
@@ -7722,7 +7714,6 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
 
        NT_PRINTER_INFO_LEVEL *printer = NULL;
        
-       uint32          param_index;
        uint32          biggest_valuesize;
        uint32          biggest_datasize;
        uint32          data_len;
@@ -7771,7 +7762,6 @@ WERROR _spoolss_enumprinterdata(pipes_struct *p, SPOOL_Q_ENUMPRINTERDATA *q_u, S
        {
                DEBUGADD(6,("Activating NT mega-hack to find sizes\n"));
 
-               param_index       = 0;
                biggest_valuesize = 0;
                biggest_datasize  = 0;
                                
@@ -9185,12 +9175,11 @@ static WERROR getprintprocessordirectory_level_1(UNISTR2 *name,
 {
        pstring path;
        pstring long_archi;
-        const char *short_archi;
        PRINTPROCESSOR_DIRECTORY_1 *info=NULL;
 
        unistr2_to_ascii(long_archi, environment, sizeof(long_archi)-1);
 
-       if (!(short_archi = get_short_archi(long_archi)))
+       if (!get_short_archi(long_archi))
                return WERR_INVALID_ENVIRONMENT;
 
        if((info=(PRINTPROCESSOR_DIRECTORY_1 *)malloc(sizeof(PRINTPROCESSOR_DIRECTORY_1))) == NULL)

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index a5f7a7b2ea9ff8f91a501848a8e6067df880e416..7fcf25d7c96ad3e26585031ea161a11025361d98 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1957,7 +1957,7 @@ static BOOL api_SetUserPassword(connection_struct *conn,uint16 vuid, char *param
 
                if (check_lanman_password(user,(unsigned char *)pass1,(unsigned char *)pass2, &hnd)) {
                        become_root();
-                       if (change_lanman_password(hnd,pass2)) {
+                       if (change_lanman_password(hnd,(uchar *)pass2)) {
                                SSVAL(*rparam,0,NERR_Success);
                        }
                        unbecome_root();