From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 7 Aug 2012 10:47:44 +0000 (+0200)
Subject: s3:smb2_server: check for compound based on SMBD_SMB2_NUM_IOV_PER_REQ
X-Git-Tag: ldb-1.1.10~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=727b1d1fa867e1421cc01f4eee95f8001d315a12;p=thirdparty%2Fsamba.git

s3:smb2_server: check for compound based on SMBD_SMB2_NUM_IOV_PER_REQ

metze
---

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 04d4f7f97b7..aa69705ef04 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1188,10 +1188,9 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
 		print_req_vectors(req);
 	}
 
-	if (req->out.vector_count > 4) {
-		struct iovec *outvec = NULL;
-
-		/* This is a compound reply. We
+	if (req->out.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ)) {
+		/*
+		 * This is a compound reply. We
 		 * must do an interim response
 		 * followed by the async response
 		 * to match W2K8R2.