From 4012c1cc8f47c7b3271a76a362ed2e4be4e8405c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 2 Nov 1997 04:01:57 +0000 Subject: convert the credentials code back to uchar[8] from uint32[2] This should fix the byte order problems (maybe!) (This used to be commit 21878e7d8628d05786c3c76f2943e31df1096577) --- source3/client/clientutil.c | 6 +++--- source3/client/ntclient.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/client') diff --git a/source3/client/clientutil.c b/source3/client/clientutil.c index 1d4f3fcb43..1794615cd0 100644 --- a/source3/client/clientutil.c +++ b/source3/client/clientutil.c @@ -197,7 +197,7 @@ BOOL cli_receive_trans_response(char *inbuf,int trans, send a SMB trans or trans2 request ****************************************************************************/ BOOL cli_send_trans_request(char *outbuf,int trans, - char *name,int name_len, int fid,int flags, + char *name,int namelen, int fid,int flags, char *data,char *param,uint16 *setup, int ldata,int lparam,int lsetup, int mdata,int mparam,int msetup) @@ -218,7 +218,7 @@ BOOL cli_send_trans_request(char *outbuf,int trans, SSVAL(outbuf,smb_tid,cnum); cli_setup_pkt(outbuf); - outparam = smb_buf(outbuf)+(trans==SMBtrans ? name_len+1 : 3); + outparam = smb_buf(outbuf)+(trans==SMBtrans ? namelen+1 : 3); outdata = outparam+this_lparam; /* primary request */ @@ -238,7 +238,7 @@ BOOL cli_send_trans_request(char *outbuf,int trans, SSVAL(outbuf,smb_setup+i*SIZEOFWORD,setup[i]); p = smb_buf(outbuf); if (trans==SMBtrans) - memcpy(p,name, name_len+1); /* name[] */ + memcpy(p,name, namelen+1); /* name[] */ else { *p++ = 0; /* put in a null smb_name */ diff --git a/source3/client/ntclient.c b/source3/client/ntclient.c index 59b4a7fe78..bf6531440e 100644 --- a/source3/client/ntclient.c +++ b/source3/client/ntclient.c @@ -63,7 +63,7 @@ BOOL do_nt_login(char *desthost, char *myhostname, UTIME zerotime; - uint32 sess_key[2]; + uchar sess_key[8]; char nt_owf_mach_pwd[16]; fstring mach_acct; fstring mach_pwd; @@ -221,8 +221,8 @@ BOOL do_nt_login(char *desthost, char *myhostname, fstrcpy(mach_pwd , myhostname); strcat(mach_acct, "$"); - clnt_chal.data[0] = 0x11111111; - clnt_chal.data[1] = 0x22222222; + SIVAL(clnt_chal.data, 0, 0x11111111); + SIVAL(clnt_chal.data, 4, 0x22222222); /* send a client challenge; receive a server challenge */ if (!do_lsa_req_chal(fnum, ++call_id, desthost, myhostname, &clnt_chal, &srv_chal)) -- cgit