From: Jeremy Allison <jra@samba.org>
Date: Wed, 5 May 2010 16:47:49 +0000 (-0700)
Subject: Get in_minimum and EOF errors right.
X-Git-Tag: samba-3.6.0pre1~2207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19758b354d835546fd9ba9cb8b9299dcea91b723;p=thirdparty%2Fsamba.git

Get in_minimum and EOF errors right.

Jeremy.
---

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index a858758aee1..a428c26ea26 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -289,13 +289,23 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
 		tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
 		return tevent_req_post(req, ev);
 	}
-	if (nread == 0 && (in_length != 0 || in_minimum != 0)) {
+	if (nread == 0 && in_length != 0) {
 		DEBUG(5,("smbd_smb2_read: read_file[%s] end of file\n",
 			 fsp_str_dbg(fsp)));
 		tevent_req_nterror(req, NT_STATUS_END_OF_FILE);
 		return tevent_req_post(req, ev);
 	}
 
+	if (nread < in_minimum) {
+		DEBUG(5,("smbd_smb2_read: read_file[%s] read less %d than "
+			"minimum requested %u. Returning end of file\n",
+			 fsp_str_dbg(fsp),
+			(int)nread,
+			(unsigned int)in_minimum));
+		tevent_req_nterror(req, NT_STATUS_END_OF_FILE);
+		return tevent_req_post(req, ev);
+	}
+
 	state->out_data.length = nread;
 	state->out_remaining = 0;
 	tevent_req_done(req);