[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-540-g251df53
Jeremy Allison
jra at samba.org
Sat Mar 29 00:33:31 GMT 2008
The branch, v3-2-test has been updated
via 251df53811e4272b629575a4b50c29a99715ccf9 (commit)
via 985bd1e642b6e54f1bc95cd4cfcceb96107e383d (commit)
via eef53e9603d4f3d892ffe00b061def5d717ca481 (commit)
from 73ead752c5ec7104ea0eed7d963dc36467c81981 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 251df53811e4272b629575a4b50c29a99715ccf9
Author: Jeremy Allison <jra at samba.org>
Date: Fri Mar 28 17:32:52 2008 -0700
Fix missing '&&'.
Jeremy.
commit 985bd1e642b6e54f1bc95cd4cfcceb96107e383d
Merge: eef53e9603d4f3d892ffe00b061def5d717ca481 73ead752c5ec7104ea0eed7d963dc36467c81981
Author: Jeremy Allison <jra at samba.org>
Date: Fri Mar 28 17:31:33 2008 -0700
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit eef53e9603d4f3d892ffe00b061def5d717ca481
Author: Jeremy Allison <jra at samba.org>
Date: Fri Mar 28 17:31:06 2008 -0700
Only allow sendfile on non-stream fsp's. Should fix make test for streams
as sendfile isn't implemented in the streams vfs modules yet.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/reply.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index bababfe..972f30d 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -2656,7 +2656,7 @@ void send_file_readbraw(connection_struct *conn,
* reply_readbraw has already checked the length.
*/
- if ( (chain_size == 0) && (nread > 0) &&
+ if ( (chain_size == 0) && (nread > 0) && (fsp->base_fsp == NULL) &&
(fsp->wcp == NULL) && lp_use_sendfile(SNUM(conn)) ) {
char header[4];
DATA_BLOB header_blob;
@@ -3131,7 +3131,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
*/
if ((chain_size == 0) && (CVAL(req->inbuf,smb_vwv0) == 0xFF) &&
- !is_encrypted_packet(req->inbuf) &&
+ !is_encrypted_packet(req->inbuf) && (fsp->base_fsp == NULL) &&
lp_use_sendfile(SNUM(conn)) && (fsp->wcp == NULL) ) {
uint8 headerbuf[smb_size + 12 * 2];
DATA_BLOB header;
--
Samba Shared Repository
More information about the samba-cvs
mailing list