diff options
| author | Jeremy Allison <jra@samba.org> | 2002-01-11 19:10:25 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-01-11 19:10:25 +0000 |
| commit | 01ff6ce4963e1daff019f2b936cef218e1c93f67 (patch) | |
| tree | cc0f4705076a09781bb9365d56e1bd5f56a59d6e /source/smbd/process.c | |
| parent | 0b0b937b58f4bf4e005fb622f0db19175fc46a47 (diff) | |
| download | samba-01ff6ce4963e1daff019f2b936cef218e1c93f67.tar.gz | |
Same fix as went into 2.2 (I'm waiting for jerry to finish some code).
Jeremy.
Diffstat (limited to 'source/smbd/process.c')
| -rw-r--r-- | source/smbd/process.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/smbd/process.c b/source/smbd/process.c index ff53acbd9ee..b1fcf864e11 100644 --- a/source/smbd/process.c +++ b/source/smbd/process.c @@ -914,11 +914,11 @@ void construct_reply_common(char *inbuf,char *outbuf) memset(outbuf,'\0',smb_size); set_message(outbuf,0,0,True); - CVAL(outbuf,smb_com) = CVAL(inbuf,smb_com); + SCVAL(outbuf,smb_com,CVAL(inbuf,smb_com)); memcpy(outbuf+4,inbuf+4,4); - CVAL(outbuf,smb_rcls) = SMB_SUCCESS; - CVAL(outbuf,smb_reh) = 0; + SCVAL(outbuf,smb_rcls,SMB_SUCCESS); + SCVAL(outbuf,smb_reh,0); SCVAL(outbuf,smb_flg, FLAG_REPLY | (CVAL(inbuf,smb_flg) & FLAG_CASELESS_PATHNAMES)); SSVAL(outbuf,smb_flg2, FLAGS2_UNICODE_STRINGS | FLAGS2_LONG_PATH_COMPONENTS | @@ -949,7 +949,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize) /* maybe its not chained */ if (smb_com2 == 0xFF) { - CVAL(outbuf,smb_vwv0) = 0xFF; + SCVAL(outbuf,smb_vwv0,0xFF); return outsize; } @@ -969,7 +969,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize) /* we need to tell the client where the next part of the reply will be */ SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf)); - CVAL(outbuf,smb_vwv0) = smb_com2; + SCVAL(outbuf,smb_vwv0,smb_com2); /* remember how much the caller added to the chain, only counting stuff after the parameter words */ @@ -991,7 +991,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize) memmove(inbuf2,inbuf,smb_wct); /* create the in buffer */ - CVAL(inbuf2,smb_com) = smb_com2; + SCVAL(inbuf2,smb_com,smb_com2); /* create the out buffer */ construct_reply_common(inbuf2, outbuf2); @@ -1006,7 +1006,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize) /* copy the new reply and request headers over the old ones, but preserve the smb_com field */ memmove(orig_outbuf,outbuf2,smb_wct); - CVAL(orig_outbuf,smb_com) = smb_com1; + SCVAL(orig_outbuf,smb_com,smb_com1); /* restore the saved data, being careful not to overwrite any data from the reply header */ |