diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-03-11 12:58:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:03 -0500 |
| commit | 7f0c7702f6b9db216fcd6c29165b2a11ea1f24a9 (patch) | |
| tree | 60fcb41a190e912c8357b16a1563b8f3586a45c3 /source4/ntvfs | |
| parent | d41b55618fcbdfe55843b1a2a8bf9c2c7196751b (diff) | |
| download | samba-7f0c7702f6b9db216fcd6c29165b2a11ea1f24a9.tar.gz samba-7f0c7702f6b9db216fcd6c29165b2a11ea1f24a9.tar.bz2 samba-7f0c7702f6b9db216fcd6c29165b2a11ea1f24a9.zip | |
r14208: removed use of req->flags2 inside the ntvfs layer. This should help
metze on his quest to unify the ntvfs strucures for the smb and smb2
servers. The only place we needed flags2 inside ntvfs was for the
FLAGS2_READ_PERMIT_EXECUTE bit, which only affects readx, so I added a
readx.in.read_for_execute flag instead.
(This used to be commit b78abbbce60ab0009da19a72dd769800c44298a2)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/ntvfs_generic.c | 1 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_read.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c index e373c7a28e..e4bc963882 100644 --- a/source4/ntvfs/ntvfs_generic.c +++ b/source4/ntvfs/ntvfs_generic.c @@ -1158,6 +1158,7 @@ _PUBLIC_ NTSTATUS ntvfs_map_read(struct ntvfs_module_context *ntvfs, } rd2->readx.level = RAW_READ_READX; + rd2->readx.in.read_for_execute = False; switch (rd->generic.level) { case RAW_READ_READX: diff --git a/source4/ntvfs/posix/pvfs_read.c b/source4/ntvfs/posix/pvfs_read.c index 15c9111d61..a6b7cf6dd0 100644 --- a/source4/ntvfs/posix/pvfs_read.c +++ b/source4/ntvfs/posix/pvfs_read.c @@ -51,7 +51,7 @@ NTSTATUS pvfs_read(struct ntvfs_module_context *ntvfs, } mask = SEC_FILE_READ_DATA; - if (req->flags2 & FLAGS2_READ_PERMIT_EXECUTE) { + if (rd->readx.in.read_for_execute) { mask |= SEC_FILE_EXECUTE; } if (!(f->access_mask & mask)) { |