diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-02 04:17:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:16 -0500 |
| commit | 8692564e350db4dfa4a9ef4c4cb014d76b284d3b (patch) | |
| tree | 891fbe0b3b55c4b7706bdb6ad8cd85c59cd070e2 /source4/libcli/raw | |
| parent | 5011f901aa0140ed60a0b58e80ab0f14810ba432 (diff) | |
| download | samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.tar.gz samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.tar.bz2 samba-8692564e350db4dfa4a9ef4c4cb014d76b284d3b.zip | |
r3458: more solaris portability fixes, the main one being that we can't use a
structure element called "open" as its a macro on solaris.
(This used to be commit 4e92e15c4e396b1d8cd211192888fea68c2cf0f9)
Diffstat (limited to 'source4/libcli/raw')
| -rw-r--r-- | source4/libcli/raw/rawfile.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c index 92b995dd4a..4da7ff3a9e 100644 --- a/source4/libcli/raw/rawfile.c +++ b/source4/libcli/raw/rawfile.c @@ -300,15 +300,15 @@ struct smbcli_request *smb_raw_open_send(struct smbcli_tree *tree, union smb_ope int len; struct smbcli_request *req = NULL; - switch (parms->open.level) { + switch (parms->generic.level) { case RAW_OPEN_T2OPEN: return smb_raw_t2open_send(tree, parms); case RAW_OPEN_OPEN: SETUP_REQUEST(SMBopen, 2, 0); - SSVAL(req->out.vwv, VWV(0), parms->open.in.flags); - SSVAL(req->out.vwv, VWV(1), parms->open.in.search_attrs); - smbcli_req_append_ascii4(req, parms->open.in.fname, STR_TERMINATE); + SSVAL(req->out.vwv, VWV(0), parms->openold.in.flags); + SSVAL(req->out.vwv, VWV(1), parms->openold.in.search_attrs); + smbcli_req_append_ascii4(req, parms->openold.in.fname, STR_TERMINATE); break; case RAW_OPEN_OPENX: @@ -397,18 +397,18 @@ NTSTATUS smb_raw_open_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx, unio goto failed; } - switch (parms->open.level) { + switch (parms->openold.level) { case RAW_OPEN_T2OPEN: return smb_raw_t2open_recv(req, mem_ctx, parms); case RAW_OPEN_OPEN: SMBCLI_CHECK_WCT(req, 7); - parms->open.out.fnum = SVAL(req->in.vwv, VWV(0)); - parms->open.out.attrib = SVAL(req->in.vwv, VWV(1)); - parms->open.out.write_time = raw_pull_dos_date3(req->transport, + parms->openold.out.fnum = SVAL(req->in.vwv, VWV(0)); + parms->openold.out.attrib = SVAL(req->in.vwv, VWV(1)); + parms->openold.out.write_time = raw_pull_dos_date3(req->transport, req->in.vwv + VWV(2)); - parms->open.out.size = IVAL(req->in.vwv, VWV(4)); - parms->open.out.rmode = SVAL(req->in.vwv, VWV(6)); + parms->openold.out.size = IVAL(req->in.vwv, VWV(4)); + parms->openold.out.rmode = SVAL(req->in.vwv, VWV(6)); break; case RAW_OPEN_OPENX: |