git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b523851
)
Final part of fix for bug #8679 - recvfile code path using splice() on Linux leaves...
author
Jeremy Allison
<jra@samba.org>
Sat, 31 Dec 2011 05:19:08 +0000
(21:19 -0800)
committer
Karolin Seeger
<kseeger@samba.org>
Mon, 5 Mar 2012 19:54:50 +0000
(20:54 +0100)
The code to set a DOS error on short writeX return is amazingly
legacy code, and also breaks the reply as fixup_chain_error_packet()
enforces a 2-byte wct on any reply where smb_rcls != 0.
Found in testing by Andrew Bartlett. Thanks Andrew !
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Dec 31 08:05:35 CET 2011 on sn-devel-104
(cherry picked from commit
e39df67669f61056692736db9c8dc16fbf2c3624
)
(cherry picked from commit
627f57f0714f257c6082b21447d122935c6e92e2
)
(cherry picked from commit
610053a6dbe0fc109e3e73c1f7cb26ec8dc48c11
)
source3/smbd/reply.c
patch
|
blob
|
history
diff --git
a/source3/smbd/reply.c
b/source3/smbd/reply.c
index 43cdf96c4d7b14bc92f89d4d7494b3c207a5c960..12d20ff5c9d6964f1761ef58358bc97ff299c438 100644
(file)
--- a/
source3/smbd/reply.c
+++ b/
source3/smbd/reply.c
@@
-4429,11
+4429,6
@@
void reply_write_and_X(struct smb_request *req)
SSVAL(req->outbuf,smb_vwv2,nwritten);
SSVAL(req->outbuf,smb_vwv4,nwritten>>16);
- if (nwritten < (ssize_t)numtowrite) {
- SCVAL(req->outbuf,smb_rcls,ERRHRD);
- SSVAL(req->outbuf,smb_err,ERRdiskfull);
- }
-
DEBUG(3,("writeX fnum=%d num=%d wrote=%d\n",
fsp->fnum, (int)numtowrite, (int)nwritten));