[Pkg-samba-maint] r3650 - in trunk/samba/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Fri Dec 3 17:08:01 UTC 2010
tags 605729 pending
thanks
Author: bubulle
Date: 2010-12-03 17:07:48 +0000 (Fri, 03 Dec 2010)
New Revision: 3650
Added:
trunk/samba/debian/patches/bug_605728_upstream_7791.patch
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/patches/series
Log:
Include upstream's patch for "gvfsd-smb (Gnome vfs) fails to copy
files from a SMB share using SMB signing.". Backported from
to be released 3.5.7 version
Closes: #605729
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2010-11-27 16:02:14 UTC (rev 3649)
+++ trunk/samba/debian/changelog 2010-12-03 17:07:48 UTC (rev 3650)
@@ -1,5 +1,6 @@
samba (2:3.5.6~dfsg-2) UNRELEASED; urgency=low
+ [ Steve Langasek ]
* Fix debian/rules update-archs target to not add extra spaces on every
invocation...
@@ -12,6 +13,12 @@
* Dutch (Remco Rijnders). Closes: #602220
* Greek (Konstantinos Margaritis).
+ [ Christian Perrier ]
+ * Include upstream's patch for "gvfsd-smb (Gnome vfs) fails to copy
+ files from a SMB share using SMB signing.". Backported from
+ to be released 3.5.7 version
+ Closes: #605729
+
-- Christian Perrier <bubulle at debian.org> Tue, 02 Nov 2010 17:23:15 +0100
samba (2:3.5.6~dfsg-1) unstable; urgency=low
Added: trunk/samba/debian/patches/bug_605728_upstream_7791.patch
===================================================================
--- trunk/samba/debian/patches/bug_605728_upstream_7791.patch (rev 0)
+++ trunk/samba/debian/patches/bug_605728_upstream_7791.patch 2010-12-03 17:07:48 UTC (rev 3650)
@@ -0,0 +1,50 @@
+From 2a9eaf741d8c169b8f06ee6498a6879acc654506 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra at samba.org>
+Date: Thu, 11 Nov 2010 09:44:21 -0800
+Subject: [PATCH] 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.
+---
+ source3/libsmb/clireadwrite.c | 7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
+index 6342de4..1f5f925 100644
+--- a/source3/libsmb/clireadwrite.c
++++ b/source3/libsmb/clireadwrite.c
+@@ -704,8 +704,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;
+@@ -779,8 +778,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
+@@ -829,7 +826,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++;
+ }
+--
+1.7.3.1
+
Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series 2010-11-27 16:02:14 UTC (rev 3649)
+++ trunk/samba/debian/patches/series 2010-12-03 17:07:48 UTC (rev 3650)
@@ -11,3 +11,4 @@
smbtar-bashism.patch
no-unnecessary-cups.patch
autoconf.patch
+bug_605728_upstream_7791.patch
More information about the Pkg-samba-maint
mailing list