diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-08 03:54:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:40 -0500 |
| commit | 19fc6e8f511f028aa40122cc7e40c83908d07ebe (patch) | |
| tree | 43fe216bd4812568fc39a01e72ec777bf398066d /source4/ntvfs/posix/pvfs_read.c | |
| parent | ce51a06f029e78212b3f02e1433f050bec394152 (diff) | |
| download | samba-19fc6e8f511f028aa40122cc7e40c83908d07ebe.tar.gz samba-19fc6e8f511f028aa40122cc7e40c83908d07ebe.tar.bz2 samba-19fc6e8f511f028aa40122cc7e40c83908d07ebe.zip | |
r3615: split out struct pvfs_file_handle from struct pvfs_file. This is in
preparation for adding code to pass the BASE-DENY1 and BASE-DENYDOS
tests, which require a shared filesystem handle for some specific
combinations of two DENY_DOS opens on the same connection.
(This used to be commit 6e4fdf01d19051e3923d7703dbf990fc1722b09a)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_read.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_read.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c index f5df26f3d1..b14a1e601c 100644 --- a/source4/ntvfs/posix/pvfs_read.c +++ b/source4/ntvfs/posix/pvfs_read.c @@ -46,7 +46,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs, return NT_STATUS_INVALID_HANDLE; } - if (f->name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) { + if (f->handle->name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) { return NT_STATUS_FILE_IS_A_DIRECTORY; } @@ -54,7 +54,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs, if (req->flags2 & FLAGS2_READ_PERMIT_EXECUTE) { mask |= SA_RIGHT_FILE_EXECUTE; } - if (!(f->access_mask & mask)) { + if (!(f->handle->access_mask & mask)) { return NT_STATUS_ACCESS_DENIED; } @@ -71,7 +71,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs, return status; } - ret = pread(f->fd, + ret = pread(f->handle->fd, rd->readx.out.data, maxcnt, rd->readx.in.offset); @@ -79,7 +79,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs, return pvfs_map_errno(pvfs, errno); } - f->position = f->seek_offset = rd->readx.in.offset + ret; + f->handle->position = f->handle->seek_offset = rd->readx.in.offset + ret; rd->readx.out.nread = ret; rd->readx.out.remaining = 0xFFFF; |