s4:libcli/smb2: align struct smb_ioctl.smb2 to [MS-SMB2] names

[samba.git] / source4 / smb_server / smb2 / fileio.c

diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c
index 92f148533e1ab8e391e1f51784c657a8f01fd907..4153a42df0d7f60e282beaf4041f2e801d1b7185 100644 (file)
--- a/source4/smb_server/smb2/fileio.c
+++ b/source4/smb_server/smb2/fileio.c
@@ -383,7 +383,7 @@ static void smb2srv_ioctl_send(struct ntvfs_request *ntvfs)
        SMB2SRV_CHECK_ASYNC_STATUS_ERR(io, union smb_ioctl);
        SMB2SRV_CHECK(smb2srv_setup_reply(req, 0x30, true, 0));
 
-       SSVAL(req->out.body,    0x02,   io->smb2.out._pad);
+       SSVAL(req->out.body,    0x02,   io->smb2.out.reserved);
        SIVAL(req->out.body,    0x04,   io->smb2.out.function);
        if (io->smb2.level == RAW_IOCTL_SMB2_NO_HANDLE) {
                struct smb2_handle h;
@@ -395,8 +395,8 @@ static void smb2srv_ioctl_send(struct ntvfs_request *ntvfs)
        }
        SMB2SRV_CHECK(smb2_push_o32s32_blob(&req->out, 0x18, io->smb2.out.in));
        SMB2SRV_CHECK(smb2_push_o32s32_blob(&req->out, 0x20, io->smb2.out.out));
-       SIVAL(req->out.body,    0x28,   io->smb2.out.unknown2);
-       SIVAL(req->out.body,    0x2C,   io->smb2.out.unknown3);
+       SIVAL(req->out.body,    0x28,   io->smb2.out.flags);
+       SIVAL(req->out.body,    0x2C,   io->smb2.out.reserved2);
 
        smb2srv_send_reply(req);
 }
@@ -411,14 +411,15 @@ void smb2srv_ioctl_recv(struct smb2srv_request *req)
        SMB2SRV_SETUP_NTVFS_REQUEST(smb2srv_ioctl_send, NTVFS_ASYNC_STATE_MAY_ASYNC);
 
        /* TODO: avoid the memcpy */
-       io->smb2.in._pad                = SVAL(req->in.body, 0x02);
+       io->smb2.in.reserved            = SVAL(req->in.body, 0x02);
        io->smb2.in.function            = IVAL(req->in.body, 0x04);
        /* file handle ... */
        SMB2SRV_CHECK(smb2_pull_o32s32_blob(&req->in, io, req->in.body+0x18, &io->smb2.in.out));
-       io->smb2.in.unknown2            = IVAL(req->in.body, 0x20);
+       io->smb2.in.max_input_response  = IVAL(req->in.body, 0x20);
        SMB2SRV_CHECK(smb2_pull_o32s32_blob(&req->in, io, req->in.body+0x24, &io->smb2.in.in));
-       io->smb2.in.max_response_size   = IVAL(req->in.body, 0x2C);
-       io->smb2.in.flags               = BVAL(req->in.body, 0x30);
+       io->smb2.in.max_output_response = IVAL(req->in.body, 0x2C);
+       io->smb2.in.flags               = IVAL(req->in.body, 0x30);
+       io->smb2.in.reserved2           = IVAL(req->in.body, 0x34);
 
        smb2_pull_handle(req->in.body + 0x08, &h);
        if (h.data[0] == UINT64_MAX && h.data[1] == UINT64_MAX) {