r11687: filled in 3 more fields in the close reply

diff --git a/source/libcli/smb2/close.c b/source/libcli/smb2/close.c
index 87220a4200e2dc480f081d5fefbe9ca5dacd09a2..4429cd557b5af208eb073e11def141616b8594d0 100644 (file)
--- a/source/libcli/smb2/close.c
+++ b/source/libcli/smb2/close.c
@@ -66,11 +66,9 @@ NTSTATUS smb2_close_recv(struct smb2_request *req, struct smb2_close *io)
        io->out.access_time = smbcli_pull_nttime(req->in.body, 0x10);
        io->out.write_time  = smbcli_pull_nttime(req->in.body, 0x18);
        io->out.change_time = smbcli_pull_nttime(req->in.body, 0x20);
-       io->out.unknown3 = IVAL(req->in.body, 0x24);
-       io->out.unknown4 = IVAL(req->in.body, 0x28);
-       io->out.unknown5 = IVAL(req->in.body, 0x2C);
-       io->out.unknown6 = IVAL(req->in.body, 0x30);
-       io->out.unknown7 = IVAL(req->in.body, 0x34);
+       io->out.alloc_size  = BVAL(req->in.body, 0x28);
+       io->out.size        = BVAL(req->in.body, 0x30);
+       io->out.file_attr   = IVAL(req->in.body, 0x38);
 
        return smb2_request_destroy(req);
 }

diff --git a/source/libcli/smb2/smb2_calls.h b/source/libcli/smb2/smb2_calls.h
index bb27716a3404ce1db5f32a2641cd8f00231aa8ee..f3d158dadd8f3929c6f060475d2e78fc5995a2c5 100644 (file)
--- a/source/libcli/smb2/smb2_calls.h
+++ b/source/libcli/smb2/smb2_calls.h
@@ -133,11 +133,9 @@ struct smb2_close {
                NTTIME   access_time;
                NTTIME   write_time;
                NTTIME   change_time;
-               uint32_t unknown3;
-               uint32_t unknown4;
-               uint32_t unknown5;
-               uint32_t unknown6;
-               uint32_t unknown7;
+               uint64_t alloc_size;
+               uint64_t size;
+               uint32_t file_attr;
        } out;
 };
 

diff --git a/source/torture/smb2/connect.c b/source/torture/smb2/connect.c
index 53236d3b27389d98ea29ca2478fef5fc24404061..68eb922b55f95f15327c84a910ee3b81ecaa579c 100644 (file)
--- a/source/torture/smb2/connect.c
+++ b/source/torture/smb2/connect.c
@@ -218,6 +218,9 @@ static NTSTATUS torture_smb2_close(struct smb2_tree *tree, struct smb2_handle ha
        printf("access_time     = %s\n", nt_time_string(tmp_ctx, io.out.access_time));
        printf("write_time      = %s\n", nt_time_string(tmp_ctx, io.out.write_time));
        printf("change_time     = %s\n", nt_time_string(tmp_ctx, io.out.change_time));
+       printf("alloc_size      = %lld\n", io.out.alloc_size);
+       printf("size            = %lld\n", io.out.size);
+       printf("file_attr       = 0x%x\n", io.out.file_attr);
 
        talloc_free(tmp_ctx);