summaryrefslogtreecommitdiff
path: root/source3/lib/util.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-01-11 19:10:25 +0000
committerJeremy Allison <jra@samba.org>2002-01-11 19:10:25 +0000
commitd6823366b881612234ab0655adb11c594f864c4a (patch)
tree325ac7bc1ac5aa03c28319501b891a99991357cf /source3/lib/util.c
parent27655be3c1708d447b046a2b0d8b2013eeb21835 (diff)
downloadsamba-d6823366b881612234ab0655adb11c594f864c4a.tar.gz
samba-d6823366b881612234ab0655adb11c594f864c4a.tar.bz2
samba-d6823366b881612234ab0655adb11c594f864c4a.zip
Same fix as went into 2.2 (I'm waiting for jerry to finish some code).
Jeremy. (This used to be commit 01ff6ce4963e1daff019f2b936cef218e1c93f67)
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r--source3/lib/util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 6caa605066..97d8973873 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -311,10 +311,10 @@ void smb_setlen(char *buf,int len)
{
_smb_setlen(buf,len);
- CVAL(buf,4) = 0xFF;
- CVAL(buf,5) = 'S';
- CVAL(buf,6) = 'M';
- CVAL(buf,7) = 'B';
+ SCVAL(buf,4,0xFF);
+ SCVAL(buf,5,'S');
+ SCVAL(buf,6,'M');
+ SCVAL(buf,7,'B');
}
/*******************************************************************
@@ -324,7 +324,7 @@ int set_message(char *buf,int num_words,int num_bytes,BOOL zero)
{
if (zero)
memset(buf + smb_size,'\0',num_words*2 + num_bytes);
- CVAL(buf,smb_wct) = num_words;
+ SCVAL(buf,smb_wct,num_words);
SSVAL(buf,smb_vwv + num_words*SIZEOFWORD,num_bytes);
smb_setlen(buf,smb_size + num_words*2 + num_bytes - 4);
return (smb_size + num_words*2 + num_bytes);
@@ -494,7 +494,7 @@ void make_dir_struct(char *buf,char *mask,char *fname,SMB_OFF_T size,int mode,ti
push_ascii(buf+1,mask2,11, 0);
memset(buf+21,'\0',DIR_STRUCT_SIZE-21);
- CVAL(buf,21) = mode;
+ SCVAL(buf,21,mode);
put_dos_date(buf,22,date);
SSVAL(buf,26,size & 0xFFFF);
SSVAL(buf,28,(size >> 16)&0xFFFF);