[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1445-g386a5d9

[Jeremy Allison]

The branch, master has been updated
       via  386a5d99b32fa1296618f59f9a9072d9faf2c8ac (commit)
      from  fee4c99be494b9679c414d6ba1938aa88adeacd3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 386a5d99b32fa1296618f59f9a9072d9faf2c8ac
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 2 11:31:37 2009 +0200

    Fix bug 6302: Give the VFS a chance to read from 0-byte files

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/reply.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d2e1f8b..418c8ba 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3358,14 +3358,13 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
 		return;
 	}
 
-	if (startpos > sbuf.st_size) {
-		smb_maxcnt = 0;
-	} else if (smb_maxcnt > (sbuf.st_size - startpos)) {
-		smb_maxcnt = (sbuf.st_size - startpos);
-	}
-
-	if (smb_maxcnt == 0) {
-		goto normal_read;
+	if (!S_ISREG(sbuf.st_mode) || (startpos > sbuf.st_size)
+	    || (smb_maxcnt > (sbuf.st_size - startpos))) {
+		/*
+		 * We already know that we would do a short read, so don't
+		 * try the sendfile() path.
+		 */
+		goto nosendfile_read;
 	}
 
 #if defined(WITH_SENDFILE)
@@ -3482,6 +3481,8 @@ normal_read:
 		return;
 	}
 
+nosendfile_read:
+
 	reply_outbuf(req, 12, smb_maxcnt);
 
 	nread = read_file(fsp, smb_buf(req->outbuf), startpos, smb_maxcnt);


-- 
Samba Shared Repository