r14173: change smb interface structures to always use

[jelmer/samba4-debian.git] / source / ntvfs / posix / pvfs_read.c

diff --git a/source/ntvfs/posix/pvfs_read.c b/source/ntvfs/posix/pvfs_read.c
index 7256fd8e169da7fdcda379bcaabc577de3b44b73..15c9111d6172a5d59aae779c04514937d08d193d 100644 (file)
--- a/source/ntvfs/posix/pvfs_read.c
+++ b/source/ntvfs/posix/pvfs_read.c
@@ -20,51 +20,74 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "include/includes.h"
+#include "includes.h"
 #include "vfs_posix.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   read from a file
 */
 NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
-                  struct smbsrv_request *req, union smb_read *rd)
+                  struct ntvfs_request *req, union smb_read *rd)
 {
        struct pvfs_state *pvfs = ntvfs->private_data;
        ssize_t ret;
        struct pvfs_file *f;
        NTSTATUS status;
+       uint32_t maxcnt;
+       uint32_t mask;
 
        if (rd->generic.level != RAW_READ_READX) {
-               return ntvfs_map_read(req, rd, ntvfs);
+               return ntvfs_map_read(ntvfs, req, rd);
        }
 
-       f = pvfs_find_fd(pvfs, req, rd->readx.in.fnum);
+       f = pvfs_find_fd(pvfs, req, rd->readx.file.fnum);
        if (!f) {
                return NT_STATUS_INVALID_HANDLE;
        }
 
-       if (f->name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) {
+       if (f->handle->fd == -1) {
                return NT_STATUS_FILE_IS_A_DIRECTORY;
        }
 
+       mask = SEC_FILE_READ_DATA;
+       if (req->flags2 & FLAGS2_READ_PERMIT_EXECUTE) {
+               mask |= SEC_FILE_EXECUTE;
+       }
+       if (!(f->access_mask & mask)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       maxcnt = rd->readx.in.maxcnt;
+       if (maxcnt > UINT16_MAX) {
+               maxcnt = 0;
+       }
+
        status = pvfs_check_lock(pvfs, f, req->smbpid, 
                                 rd->readx.in.offset,
-                                rd->readx.in.maxcnt,
+                                maxcnt,
                                 READ_LOCK);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       ret = pread(f->fd, 
-                   rd->readx.out.data, 
-                   rd->readx.in.maxcnt,
-                   rd->readx.in.offset);
+       if (f->handle->name->stream_name) {
+               ret = pvfs_stream_read(pvfs, f->handle, 
+                                      rd->readx.out.data, maxcnt, rd->readx.in.offset);
+       } else {
+               ret = pread(f->handle->fd, 
+                           rd->readx.out.data, 
+                           maxcnt,
+                           rd->readx.in.offset);
+       }
        if (ret == -1) {
                return pvfs_map_errno(pvfs, errno);
        }
 
+       f->handle->position = f->handle->seek_offset = rd->readx.in.offset + ret;
+
        rd->readx.out.nread = ret;
-       rd->readx.out.remaining = 0; /* should fill this in? */
+       rd->readx.out.remaining = 0xFFFF;
        rd->readx.out.compaction_mode = 0; 
 
        return NT_STATUS_OK;