From 8daeee5c5d7d5851677089cceaf26a0e32675a96 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 27 May 2008 18:20:23 +1000
Subject: ensure that we honor SMB2 read min_count properly (This used to be
 commit 318038d6f670efffa96d8b0db63f46b3752e1cd3)

---
 source4/ntvfs/posix/pvfs_read.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source4/ntvfs/posix/pvfs_read.c')

diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c
index 418b7e09fb..a01a8a57e3 100644
--- a/source4/ntvfs/posix/pvfs_read.c
+++ b/source4/ntvfs/posix/pvfs_read.c
@@ -93,6 +93,14 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
 		return pvfs_map_errno(pvfs, errno);
 	}
 
+	/* only SMB2 honors mincnt */
+	if (req->ctx->protocol == PROTOCOL_SMB2) {
+		if (rd->readx.in.mincnt > ret ||
+		    (ret == 0 && maxcnt > 0)) {
+			return NT_STATUS_END_OF_FILE;
+		}
+	}
+
 	f->handle->position = f->handle->seek_offset = rd->readx.in.offset + ret;
 
 	rd->readx.out.nread = ret;
-- 
cgit