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 0f7d3b4b0c4f619ce0622ef6e2a135662628ecd5..15c9111d6172a5d59aae779c04514937d08d193d 100644 (file)
--- a/source/ntvfs/posix/pvfs_read.c
+++ b/source/ntvfs/posix/pvfs_read.c
@@ -22,13 +22,13 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "system/filesys.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;
@@ -38,10 +38,10 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
        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;
        }
@@ -50,9 +50,9 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
                return NT_STATUS_FILE_IS_A_DIRECTORY;
        }
 
-       mask = SA_RIGHT_FILE_READ_DATA;
+       mask = SEC_FILE_READ_DATA;
        if (req->flags2 & FLAGS2_READ_PERMIT_EXECUTE) {
-               mask |= SA_RIGHT_FILE_EXECUTE;
+               mask |= SEC_FILE_EXECUTE;
        }
        if (!(f->access_mask & mask)) {
                return NT_STATUS_ACCESS_DENIED;
@@ -71,10 +71,15 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs,
                return status;
        }
 
-       ret = pread(f->handle->fd, 
-                   rd->readx.out.data, 
-                   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);
        }