[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-136-g3d3d1b8
Jeremy Allison
jra at samba.org
Tue Oct 30 19:55:14 GMT 2007
The branch, v3-2-test has been updated
via 3d3d1b806aef3617abaac46daf230ed32076e2ce (commit)
from 95f76ae7a52c6b22db22d03fed6b0848d2a61bee (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 3d3d1b806aef3617abaac46daf230ed32076e2ce
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 30 12:54:39 2007 -0700
Our userlevel SMBwriteX call is non-standard in that it
sometimes uses a 12-word write and doesn't include a pad
byte (as Windows does). Fix this so that we are identical
to Windows clients. This will make recvfile processing
much easier to detect (as we can just read a standard
writeX header length to decide).
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/libsmb/clireadwrite.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index 0d037e9..e2d5337 100644
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -291,7 +291,7 @@ static bool cli_issue_write(struct cli_state *cli, int fnum, off_t offset,
char *p;
bool large_writex = False;
- if (size > cli->bufsize) {
+ if (size + 1 > cli->bufsize) {
cli->outbuf = (char *)SMB_REALLOC(cli->outbuf, size + 1024);
if (!cli->outbuf) {
return False;
@@ -307,7 +307,7 @@ static bool cli_issue_write(struct cli_state *cli, int fnum, off_t offset,
memset(cli->outbuf,'\0',smb_size);
memset(cli->inbuf,'\0',smb_size);
- if (((SMB_BIG_UINT)offset >> 32) || (size > 0xFFFF)) {
+ if (cli->capabilities & CAP_LARGE_FILES) {
large_writex = True;
}
@@ -315,11 +315,11 @@ static bool cli_issue_write(struct cli_state *cli, int fnum, off_t offset,
set_message(cli->outbuf,14,0,True);
else
set_message(cli->outbuf,12,0,True);
-
+
SCVAL(cli->outbuf,smb_com,SMBwriteX);
SSVAL(cli->outbuf,smb_tid,cli->cnum);
cli_setup_packet(cli);
-
+
SCVAL(cli->outbuf,smb_vwv0,0xFF);
SSVAL(cli->outbuf,smb_vwv2,fnum);
@@ -336,19 +336,21 @@ static bool cli_issue_write(struct cli_state *cli, int fnum, off_t offset,
*/
SSVAL(cli->outbuf,smb_vwv9,((size>>16)&1));
SSVAL(cli->outbuf,smb_vwv10,size);
+ /* +1 is pad byte. */
SSVAL(cli->outbuf,smb_vwv11,
- smb_buf(cli->outbuf) - smb_base(cli->outbuf));
+ smb_buf(cli->outbuf) - smb_base(cli->outbuf) + 1);
if (large_writex) {
SIVAL(cli->outbuf,smb_vwv12,(((SMB_BIG_UINT)offset)>>32) & 0xffffffff);
}
-
- p = smb_base(cli->outbuf) + SVAL(cli->outbuf,smb_vwv11);
+
+ p = smb_base(cli->outbuf) + SVAL(cli->outbuf,smb_vwv11) -1;
+ *p++ = '\0'; /* pad byte. */
memcpy(p, buf, size);
cli_setup_bcc(cli, p+size);
SSVAL(cli->outbuf,smb_mid,cli->mid + i);
-
+
show_msg(cli->outbuf);
return cli_send_smb(cli);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list