[Pkg-samba-maint] r2993 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

tags 536757 pending
thanks

Author: bubulle
Date: 2009-08-20 19:46:16 +0000 (Thu, 20 Aug 2009)
New Revision: 2993

Added:
   trunk/samba/debian/patches/536757.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Fix "invalid argument" when trying to copy a file from smb share
Use an upstream patch that will be included in 3.4.1


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-08-20 11:29:14 UTC (rev 2992)
+++ trunk/samba/debian/changelog	2009-08-20 19:46:16 UTC (rev 2993)
@@ -1,8 +1,14 @@
 samba (2:3.4.0-3) UNRELEASED; urgency=low
 
+  [ Steve Langasek ]
   * debian/control: samba-common-bin has no reason to depend on
     libpam-modules.
 
+  [ Christian Perrier ]
+  * Fix "invalid argument" when trying to copy a file from smb share
+    Use an upstream patch that will be included in 3.4.1
+    Closes: #536757
+
  -- Steve Langasek <vorlon at debian.org>  Tue, 18 Aug 2009 18:34:30 -0700
 
 samba (2:3.4.0-2) unstable; urgency=low

Added: trunk/samba/debian/patches/536757.patch
===================================================================
--- trunk/samba/debian/patches/536757.patch	                        (rev 0)
+++ trunk/samba/debian/patches/536757.patch	2009-08-20 19:46:16 UTC (rev 2993)
@@ -0,0 +1,20 @@
+Goal: fix failure to copy files when the size returned from a read is
+      zero
+
+Fixes: bug #536757
+
+Upstream status: will be fixed in 3.4.1
+
+Index: samba/source3/libsmb/clireadwrite.c
+===================================================================
+--- samba.orig/source3/libsmb/clireadwrite.c	2009-08-20 15:52:33.000000000 +0200
++++ samba/source3/libsmb/clireadwrite.c	2009-08-20 16:06:12.000000000 +0200
+@@ -185,7 +185,7 @@
+ 	buf = (uint8_t *)smb_base(cli_req->inbuf) + SVAL(vwv+6, 0);
+ 
+ 	if (trans_oob(smb_len(cli_req->inbuf), SVAL(vwv+6, 0), size)
+-	    || (buf < bytes)) {
++	    || (size && (buf < bytes))) {
+ 		DEBUG(5, ("server returned invalid read&x data offset\n"));
+ 		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+ 	}

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2009-08-20 11:29:14 UTC (rev 2992)
+++ trunk/samba/debian/patches/series	2009-08-20 19:46:16 UTC (rev 2993)
@@ -12,3 +12,4 @@
 no-unnecessary-cups.patch
 fix-manpages-warnings.patch
 codepages-location.patch
+536757.patch