summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-07 12:47:44 +0200
committerStefan Metzmacher <metze@samba.org>2012-08-07 18:32:45 +0200
commit727b1d1fa867e1421cc01f4eee95f8001d315a12 (patch)
treee6eb06565fe728bd51f3472806715f99ff959df3 /source3
parent2da62179de7d2547703ff6ae78f80518abed91b8 (diff)
downloadsamba-727b1d1fa867e1421cc01f4eee95f8001d315a12.tar.gz
samba-727b1d1fa867e1421cc01f4eee95f8001d315a12.tar.bz2
samba-727b1d1fa867e1421cc01f4eee95f8001d315a12.zip
s3:smb2_server: check for compound based on SMBD_SMB2_NUM_IOV_PER_REQ
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/smb2_server.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 04d4f7f97b..aa69705ef0 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.