[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  254d3da Fix bug #7791 - gvfsd-smb (Gnome vfs) fails to copy files from a SMB share using SMB signing.
      from  2791ecb Fix memleak I accidently introduced when reading from tdb.

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


- Log -----------------------------------------------------------------
commit 254d3da934086e0bbfb74f23167eefbcc0759e1a
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 10 17:59:05 2010 -0800

    Fix bug #7791 - gvfsd-smb (Gnome vfs) fails to copy files from a SMB share using SMB signing.
    
    The underlying problem is that the old code invoked by cli_write() increments
    cli->mid directly when issuing outstanding writes. This should now be done only
    in libsmb/clientgen.c to make metze's new signing engine works correctly. Just
    deleting this code fixes the problem.
    
    Jeremy.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Nov 11 02:50:08 UTC 2010 on sn-devel-104
    (cherry picked from commit 0afb2995a2177afa2eb7b8f99887a39cdaf23a15)

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

Summary of changes:
 source3/libsmb/clireadwrite.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 24c9d9f..81fb88c 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -702,8 +702,7 @@ static bool cli_issue_write(struct cli_state *cli,
 				off_t offset,
 				uint16 mode,
 				const char *buf,
-				size_t size,
-				int i)
+				size_t size)
 {
 	char *p;
 	bool large_writex = false;
@@ -777,8 +776,6 @@ static bool cli_issue_write(struct cli_state *cli,
 		cli_setup_bcc(cli, p+size);
 	}
 
-	SSVAL(cli->outbuf,smb_mid,cli->mid + i);
-
 	show_msg(cli->outbuf);
 	if (direct_writes) {
 		/* For direct writes we now need to write the data
@@ -827,7 +824,7 @@ ssize_t cli_write(struct cli_state *cli,
 			if (!cli_issue_write(cli, fnum, offset + bsent,
 			                write_mode,
 			                buf + bsent,
-					size1, issued))
+					size1))
 				return -1;
 			issued++;
 		}


-- 
Samba Shared Repository