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/smb_server | |
| 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/smb_server')
| -rw-r--r-- | source4/smb_server/reply.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c index 1b697c4ba7..1ffd55bf3f 100644 --- a/source4/smb_server/reply.c +++ b/source4/smb_server/reply.c @@ -407,11 +407,11 @@ static void reply_open_send(struct smbsrv_request *req) /* construct reply */ req_setup_reply(req, 7, 0); - SSVAL(req->out.vwv, VWV(0), oi->open.out.fnum); - SSVAL(req->out.vwv, VWV(1), oi->open.out.attrib); - srv_push_dos_date3(req->smb_conn, req->out.vwv, VWV(2), oi->open.out.write_time); - SIVAL(req->out.vwv, VWV(4), oi->open.out.size); - SSVAL(req->out.vwv, VWV(6), oi->open.out.rmode); + SSVAL(req->out.vwv, VWV(0), oi->openold.out.fnum); + SSVAL(req->out.vwv, VWV(1), oi->openold.out.attrib); + srv_push_dos_date3(req->smb_conn, req->out.vwv, VWV(2), oi->openold.out.write_time); + SIVAL(req->out.vwv, VWV(4), oi->openold.out.size); + SSVAL(req->out.vwv, VWV(6), oi->openold.out.rmode); req_send_reply(req); } @@ -427,13 +427,13 @@ void reply_open(struct smbsrv_request *req) REQ_CHECK_WCT(req, 2); REQ_TALLOC(oi, sizeof(*oi)); - oi->open.level = RAW_OPEN_OPEN; - oi->open.in.flags = SVAL(req->in.vwv, VWV(0)); - oi->open.in.search_attrs = SVAL(req->in.vwv, VWV(1)); + oi->openold.level = RAW_OPEN_OPEN; + oi->openold.in.flags = SVAL(req->in.vwv, VWV(0)); + oi->openold.in.search_attrs = SVAL(req->in.vwv, VWV(1)); - req_pull_ascii4(req, &oi->open.in.fname, req->in.data, STR_TERMINATE); + req_pull_ascii4(req, &oi->openold.in.fname, req->in.data, STR_TERMINATE); - if (!oi->open.in.fname) { + if (!oi->openold.in.fname) { req_reply_error(req, NT_STATUS_OBJECT_NAME_NOT_FOUND); return; } @@ -1396,7 +1396,7 @@ static void reply_printopen_send(struct smbsrv_request *req) /* construct reply */ req_setup_reply(req, 1, 0); - SSVAL(req->out.vwv, VWV(0), oi->open.out.fnum); + SSVAL(req->out.vwv, VWV(0), oi->openold.out.fnum); req_send_reply(req); } |