The branch, master has been updated via d8fc4cd s3:smb2_read: fix SMBD_SMB2_NUM_IOV_PER_REQ check for sendfile() support (bug #9341) from e6643fb wafbuild: use -Wstack-protector if available
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d8fc4cd25e40164e23c0375b073cb42723892146 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Oct 30 11:08:19 2012 +0100 s3:smb2_read: fix SMBD_SMB2_NUM_IOV_PER_REQ check for sendfile() support (bug #9341) Reported-by: Sebastien LAVEZE <sebastien.lav...@mindspeed.com> Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> Tested-by: Sebastien LAVEZE <sebastien.lav...@mindspeed.com> Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Tue Oct 30 16:49:26 CET 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/smbd/smb2_read.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 2890f86..41adb03 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -277,7 +277,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req, if (!lp__use_sendfile(SNUM(fsp->conn)) || smb2req->do_signing || smb2req->do_encryption || - smb2req->in.vector_count < (2*SMBD_SMB2_NUM_IOV_PER_REQ) || + smb2req->in.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ) || (fsp->base_fsp != NULL) || (fsp->wcp != NULL) || (!S_ISREG(fsp->fsp_name->st.st_ex_mode)) || -- Samba Shared Repository