[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-15-g4648c1a

Jeremy Allison jra at samba.org
Fri Mar 28 17:14:03 GMT 2008


The branch, v3-0-test has been updated
       via  4648c1ab78ccf00893c10a024928f165101c8e12 (commit)
      from  106ef5ba82380e13bdaf5011a25653040cb481fc (commit)

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


- Log -----------------------------------------------------------------
commit 4648c1ab78ccf00893c10a024928f165101c8e12
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 28 10:13:39 2008 -0700

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

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

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


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index dd7ddce..81e9043 100644
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -352,10 +352,12 @@ ssize_t cli_write(struct cli_state *cli,
 	}
 
 	while (received < blocks) {
+		ssize_t size1;
 
 		while ((issued - received < mpx) && (issued < blocks)) {
 			ssize_t bsent = issued * block;
-			ssize_t size1 = MIN(block, size - bsent);
+
+			size1 = MIN(block, size - bsent);
 
 			if (!cli_issue_write(cli, fnum, offset + bsent,
 			                write_mode,
@@ -374,7 +376,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 (size1 > 0xFFFF) {
+			bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+		}
 	}
 
 	while (received < issued && cli_receive_smb(cli))


-- 
Samba Shared Repository


More information about the samba-cvs mailing list