Start of merge to 2_2_RELEASE branch for release.

Jeremy.

1 files changed, 11 insertions, 0 deletions

diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index 93333bff951..ca0b1bb2d51 100644
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -224,6 +224,14 @@ static BOOL cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint1
 {
 	char *p;
 
+	if (size > cli->bufsize) {
+		cli->outbuf = realloc(cli->outbuf, size + 1024);
+		cli->inbuf = realloc(cli->inbuf, size + 1024);
+		if (cli->outbuf == NULL || cli->inbuf == NULL)
+			return False;
+		cli->bufsize = size + 1024;
+	}
+
 	memset(cli->outbuf,'\0',smb_size);
 	memset(cli->inbuf,'\0',smb_size);
 
@@ -301,6 +309,7 @@ ssize_t cli_write(struct cli_state *cli,
 			break;
 
 		bwritten += SVAL(cli->inbuf, smb_vwv2);
+		bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))>>16);
 	}
 
 	while (received < issued && cli_receive_smb(cli))
@@ -358,6 +367,8 @@ ssize_t cli_smbwrite(struct cli_state *cli,
 
 		size1 -= size;
 		total += size;
+		offset += size;
+
 	} while (size1);
 
 	return total;