From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 8 Aug 2012 04:17:33 +0000 (+0200)
Subject: s3:smb2_read: use SMBD_SMB2_NUM_IOV_PER_REQ when checking for sendfile() support
X-Git-Tag: ldb-1.1.10~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=644eab32af2ad9926e665642ffd212d0472b3d19;p=thirdparty%2Fsamba.git

s3:smb2_read: use SMBD_SMB2_NUM_IOV_PER_REQ when checking for sendfile() support

metze
---

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 1d6b8588c54..150bdb8cf19 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -276,7 +276,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req,
 
 	if (!lp__use_sendfile(SNUM(fsp->conn)) ||
 	    smb2req->do_signing ||
-	    smb2req->in.vector_count != 4 ||
+	    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)) ||