[Pkg-samba-maint] r3035 - trunk/samba/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-09-09 20:11:47 +0000 (Wed, 09 Sep 2009)
New Revision: 3035

Removed:
   trunk/samba/debian/patches/536757.patch
Modified:
   trunk/samba/debian/patches/series
Log:
Patch is applied upstream


Deleted: trunk/samba/debian/patches/536757.patch
===================================================================
--- trunk/samba/debian/patches/536757.patch	2009-09-09 19:58:17 UTC (rev 3034)
+++ trunk/samba/debian/patches/536757.patch	2009-09-09 20:11:47 UTC (rev 3035)
@@ -1,20 +0,0 @@
-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-09-09 19:58:17 UTC (rev 3034)
+++ trunk/samba/debian/patches/series	2009-09-09 20:11:47 UTC (rev 3035)
@@ -12,6 +12,5 @@
 no-unnecessary-cups.patch
 fix-manpages-warnings.patch
 codepages-location.patch
-536757.patch
 external-talloc-support.patch
 autoconf.patch