warnings spotted by ./configure.developer options
authorLuke Leighton <lkcl@samba.org>
Wed, 14 Oct 1998 07:00:00 +0000 (07:00 +0000)
committerLuke Leighton <lkcl@samba.org>
Wed, 14 Oct 1998 07:00:00 +0000 (07:00 +0000)
(This used to be commit 29434bf195b438f4ab41a10ac5ce03f9c2d2ac2f)

source3/include/proto.h
source3/libsmb/smbencrypt.c
source3/rpc_client/cli_pipe.c
source3/rpcclient/cmd_samr.c
source3/rpcclient/rpcclient.c

index 8a0ff12ed9e88d29b98d333f3312e1a635cfae9c..5e47faf5ef6f126be0e075146c31154b6a56dfd4 100644 (file)
@@ -72,7 +72,6 @@ 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, char *buffer);
 
 /*The following definitions come from  lib/debug.c  */
index 7caf417ea1f2e337acec10fe8e098f2988514dec..66eba88f4935f0442a78dd59e8995d175a8fea9e 100644 (file)
@@ -222,5 +222,7 @@ BOOL make_oem_passwd_hash(char data[516], char *passwd, char old_pw_hash[16], BO
        dump_data(100, data, 516);
 #endif
        SamOEMhash( (unsigned char *)data, (unsigned char *)old_pw_hash, True);
+
+       return True;
 }
 
index 93befe7ac4b0f494d8992760bff7e72870c5e51d..405b6abe663e558549af7dd16d49ed352d559b6b 100644 (file)
@@ -37,17 +37,12 @@ extern pstring global_myname;
 /********************************************************************
  rpc pipe call id 
  ********************************************************************/
-static uint32 call_id = 0;
 static uint32 get_rpc_call_id(void)
 {
+  static uint32 call_id = 0;
   return ++call_id;
 }
 
-static uint32 reset_rpc_call_id(void)
-{
-       call_id = 0;
-}
-
 /*******************************************************************
  uses SMBreadX to get rest of rpc data
  ********************************************************************/
@@ -372,7 +367,7 @@ static BOOL create_rpc_bind_req(prs_struct *rhdr,
                                 prs_struct *rhdr_auth,
                                 prs_struct *auth_req,
                                 prs_struct *auth_ntlm,
-                               uint32 call_id,
+                               uint32 rpc_call_id,
                                 RPC_IFACE *abstract, RPC_IFACE *transfer,
                                 char *my_name, char *domain, uint32 neg_flags)
 {
@@ -410,7 +405,7 @@ static BOOL create_rpc_bind_req(prs_struct *rhdr,
        }
 
        /* create the request RPC_HDR */
-       make_rpc_hdr(&hdr, RPC_BIND, 0x0, call_id,
+       make_rpc_hdr(&hdr, RPC_BIND, 0x0, rpc_call_id,
                     (auth_req  != NULL ? auth_req ->offset : 0) +
                     (auth_ntlm != NULL ? auth_ntlm->offset : 0) +
                     (rhdr_auth != NULL ? rhdr_auth->offset : 0) +
@@ -456,7 +451,7 @@ static BOOL create_rpc_bind_req(prs_struct *rhdr,
 static BOOL create_rpc_bind_resp(struct pwd_info *pwd,
                                char *domain, char *user_name, char *my_name,
                                uint32 ntlmssp_cli_flgs,
-                               uint32 call_id,
+                               uint32 rpc_call_id,
                                prs_struct *rhdr,
                                 prs_struct *rhdr_autha,
                                 prs_struct *auth_resp)
@@ -489,7 +484,7 @@ static BOOL create_rpc_bind_resp(struct pwd_info *pwd,
        mem_realloc_data(auth_resp->data, auth_resp->offset);
 
        /* create the request RPC_HDR */
-       make_rpc_hdr(&hdr, RPC_BINDRESP, 0x0, call_id,
+       make_rpc_hdr(&hdr, RPC_BINDRESP, 0x0, rpc_call_id,
                     auth_resp->offset + rhdr_autha->offset + 0x10,
                     auth_resp->offset);
 
@@ -800,7 +795,6 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name,
        prs_struct hdr;
        prs_struct hdr_rb;
        prs_struct hdr_auth;
-       prs_struct hdr_autha;
        prs_struct auth_req;
        prs_struct auth_ntlm;
        prs_struct data;
@@ -809,7 +803,7 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name,
 
        BOOL valid_ack = False;
        BOOL ntlmssp_auth = cli->ntlmssp_cli_flgs != 0;
-       uint32 call_id;
+       uint32 rpc_call_id;
 
        if (pipe_name == NULL || abstract == NULL || transfer == NULL)
        {
@@ -829,12 +823,12 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name,
        prs_init(&rdata    , 0   , 4, SAFETY_MARGIN, True);
        prs_init(&rparam   , 0   , 4, SAFETY_MARGIN, True);
 
-       call_id = get_rpc_call_id();
+       rpc_call_id = get_rpc_call_id();
        create_rpc_bind_req(&hdr, &hdr_rb,
                            ntlmssp_auth ? &hdr_auth : NULL,
                            ntlmssp_auth ? &auth_req : NULL,
                            ntlmssp_auth ? &auth_ntlm : NULL,
-                           call_id,
+                           rpc_call_id,
                            abstract, transfer,
                            global_myname, cli->domain, cli->ntlmssp_cli_flgs);
 
@@ -897,7 +891,7 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name,
                        create_rpc_bind_resp(&cli->pwd, cli->domain,
                                             cli->user_name, global_myname, 
                                             cli->ntlmssp_cli_flgs,
-                                            call_id,
+                                            rpc_call_id,
                                             &hdra, &hdr_autha, &auth_resp);
                                            
                        pwd_get_lm_nt_owf(&cli->pwd, lm_owf, NULL);
@@ -938,8 +932,6 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name,
        prs_mem_free(&rdata    );
        prs_mem_free(&rparam   );
 
-       reset_rpc_call_id();
-
        return valid_ack;
 }
 
@@ -953,8 +945,6 @@ BOOL cli_nt_session_open(struct cli_state *cli, char *pipe_name, BOOL encrypted)
        RPC_IFACE transfer;
        int fnum;
 
-       reset_rpc_call_id();
-
        /******************* open the pipe *****************/
        if (IS_BITS_SET_ALL(cli->capabilities, CAP_NT_SMBS))
        {
@@ -1006,7 +996,7 @@ BOOL cli_nt_session_open(struct cli_state *cli, char *pipe_name, BOOL encrypted)
                                    NTLMSSP_NEGOTIATE_00001000 |
                                    NTLMSSP_NEGOTIATE_00002000;
  */
-               DEBUG(5,("cli_nt_session_open: neg_flags: %lx\n",
+               DEBUG(5,("cli_nt_session_open: neg_flags: %x\n",
                         cli->ntlmssp_cli_flgs));
        }
 
index 2b5fe909ab31f11e0980d808d9bf34377ae83904..3760b3f22d343ec4a94d96daa694c8b3a8ad1266 100644 (file)
@@ -113,7 +113,6 @@ void cmd_sam_test(struct client_info *info)
        fstring srv_name;
        fstring domain;
        fstring sid;
-       char *new_passwd;
        BOOL res = True;
 
        fstrcpy(sid   , info->dom.level5_sid);
index a31fd60b0c5421ff8bd870930e106a3e61e43305..7d1df61bb7f35764164de1b1b73aa6092914813a 100644 (file)
@@ -459,7 +459,7 @@ enum client_action
 
        TimeInit();
        charset_initialise();
-       crc32_build_table();
+/*     crc32_build_table(); */
 
        myumask = umask(0);
        umask(myumask);