summaryrefslogtreecommitdiff
path: root/source4/libcli/raw
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-03-11 12:58:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:03 -0500
commit7f0c7702f6b9db216fcd6c29165b2a11ea1f24a9 (patch)
tree60fcb41a190e912c8357b16a1563b8f3586a45c3 /source4/libcli/raw
parentd41b55618fcbdfe55843b1a2a8bf9c2c7196751b (diff)
downloadsamba-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/libcli/raw')
-rw-r--r--source4/libcli/raw/interfaces.h1
-rw-r--r--source4/libcli/raw/rawreadwrite.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index e476a00b68..086686b9e9 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -1352,6 +1352,7 @@ union smb_read {
uint16_t mincnt;
uint32_t maxcnt;
uint16_t remaining;
+ BOOL read_for_execute;
} in;
struct {
uint8_t *data;
diff --git a/source4/libcli/raw/rawreadwrite.c b/source4/libcli/raw/rawreadwrite.c
index 00dc71971e..c4e2ab2498 100644
--- a/source4/libcli/raw/rawreadwrite.c
+++ b/source4/libcli/raw/rawreadwrite.c
@@ -84,6 +84,9 @@ struct smbcli_request *smb_raw_read_send(struct smbcli_tree *tree, union smb_rea
if (bigoffset) {
SIVAL(req->out.vwv, VWV(10),parms->readx.in.offset>>32);
}
+ if (parms->readx.in.read_for_execute) {
+ req->flags2 |= FLAGS2_READ_PERMIT_EXECUTE;
+ }
break;
}