[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-531-gd090d25

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  d090d25cb702965b3d5e4635a26a06f2b62d235d (commit)
      from  c0be84c96d8133c6b77d1f0efe41f5f2373febb3 (commit)

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


- Log -----------------------------------------------------------------
commit d090d25cb702965b3d5e4635a26a06f2b62d235d
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 28 10:12:07 2008 -0700

    Fix bug #5326 - OS/2 servers give strange "high word" replies for print jobs.
    Jeremy.

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

Summary of changes:
 source/libsmb/clireadwrite.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index 668a269..e79fd90 100644
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -745,7 +745,9 @@ ssize_t cli_write(struct cli_state *cli,
 			break;
 
 		bwritten += SVAL(cli->inbuf, smb_vwv2);
-		bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+		if (writesize > 0xFFFF) {
+			bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+		}
 	}
 
 	while (received < issued && cli_receive_smb(cli)) {


-- 
Samba Shared Repository