first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[kai/samba.git] / source3 / rpc_client / cli_login.c

diff --git a/source3/rpc_client/cli_login.c b/source3/rpc_client/cli_login.c
index e18062220b8d0526ea7410206c30ba668999f881..5fe392f2148415136ff6c6c1acc05bdf08e3d12b 100644 (file)
--- a/source3/rpc_client/cli_login.c
+++ b/source3/rpc_client/cli_login.c
@@ -4,6 +4,7 @@
    NT Domain Authentication SMB / MSRPC client
    Copyright (C) Andrew Tridgell 1994-1997
    Copyright (C) Luke Kenneth Casson Leighton 1996-1997
+   Copyright (C) Jeremy Allison  1999.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -53,7 +54,7 @@ BOOL cli_nt_setup_creds(struct cli_state *cli, unsigned char mach_pwd[16])
 
   /* calculate the session key */
   cred_session_key(&clnt_chal, &srv_chal, (char *)mach_pwd, cli->sess_key);
-  bzero(cli->sess_key+8, 8);
+  memset((char *)cli->sess_key+8, '\0', 8);
 
   /******************* Authenticate 2 ********************/
 
@@ -86,7 +87,7 @@ BOOL cli_nt_srv_pwset(struct cli_state *cli, unsigned char *new_hashof_mach_pwd)
   DEBUG(5,("cli_nt_srv_pwset: %d\n", __LINE__));
 
 #ifdef DEBUG_PASSWORD
-  dump_data(6, new_hashof_mach_pwd, 16);
+  dump_data(6, (char *)new_hashof_mach_pwd, 16);
 #endif
 
   /* Process the new password. */
@@ -117,10 +118,10 @@ BOOL cli_nt_login_interactive(struct cli_state *cli, char *domain, char *usernam
 #ifdef DEBUG_PASSWORD
 
   DEBUG(100,("nt owf of user password: "));
-  dump_data(100, lm_owf_user_pwd, 16);
+  dump_data(100, (char *)lm_owf_user_pwd, 16);
 
   DEBUG(100,("nt owf of user password: "));
-  dump_data(100, nt_owf_user_pwd, 16);
+  dump_data(100, (char *)nt_owf_user_pwd, 16);
 
 #endif
 
@@ -130,7 +131,7 @@ BOOL cli_nt_login_interactive(struct cli_state *cli, char *domain, char *usernam
   ctr->switch_value = INTERACTIVE_LOGON_TYPE;
 
   /* Create the structure needed for SAM logon. */
-  make_id_info1(&ctr->auth.id1, domain, 0, 
+  init_id_info1(&ctr->auth.id1, domain, 0, 
                 smb_userid_low, 0,
                 username, cli->clnt_name_slash,
                 (char *)cli->sess_key, lm_owf_user_pwd, nt_owf_user_pwd);
@@ -166,7 +167,7 @@ BOOL cli_nt_login_network(struct cli_state *cli, char *domain, char *username,
   ctr->switch_value = NET_LOGON_TYPE;
 
   /* Create the structure needed for SAM logon. */
-  make_id_info2(&ctr->auth.id2, domain, 0, 
+  init_id_info2(&ctr->auth.id2, domain, 0, 
                 smb_userid_low, 0,
                 username, cli->clnt_name_slash,
                 (uchar *)lm_chal, (uchar *)lm_chal_resp, (uchar *)nt_chal_resp);