[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-157-g1c71546

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  1c71546b6152d2930b98f766311bbd161ee0ee4e (commit)
      from  779353b86d1699324149896f1ffa237c6ebe46ec (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 1c71546b6152d2930b98f766311bbd161ee0ee4e
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 1 21:51:45 2007 -0700

    Ensure we detect a large writeX when using recvfile.
    More changes needed to make the UNIX_LARGE_WRITEX_CAP
    writes work (I'll add these tomorrow).
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/reply.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index d2aa6c6..d4f3f1f 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -3926,7 +3926,8 @@ void reply_write_and_X(connection_struct *conn, struct smb_request *req)
 	numtowrite = SVAL(req->inbuf,smb_vwv10);
 	smb_doff = SVAL(req->inbuf,smb_vwv11);
 	smblen = smb_len(req->inbuf);
-	large_writeX = ((req->wct == 14) && (smblen > 0xFFFF));
+	large_writeX = (req->wct == 14 &&
+			(smblen > 0xFFFF || req->unread_bytes > 0xFFFF));
 
 	/* Deal with possible LARGE_WRITEX */
 	if (large_writeX) {


-- 
Samba Shared Repository