summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-11-11 21:22:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:46:13 -0500
commit222e197b848e2f1e58602d1e709f057a1f8833fd (patch)
treebec800acb2a9710aab6ea59a41b5cf6491fcf0a6
parentbe77dac05f22b93345aa7b6f8ba42615d74b19a4 (diff)
downloadsamba-222e197b848e2f1e58602d1e709f057a1f8833fd.tar.gz
samba-222e197b848e2f1e58602d1e709f057a1f8833fd.tar.bz2
samba-222e197b848e2f1e58602d1e709f057a1f8833fd.zip
r11687: filled in 3 more fields in the close reply
(This used to be commit 3a0abb3ff0b532179780ed95f8fcb4bca6e040b1)
-rw-r--r--source4/libcli/smb2/close.c8
-rw-r--r--source4/libcli/smb2/smb2_calls.h8
-rw-r--r--source4/torture/smb2/connect.c3
3 files changed, 9 insertions, 10 deletions
diff --git a/source4/libcli/smb2/close.c b/source4/libcli/smb2/close.c
index 87220a4200..4429cd557b 100644
--- a/source4/libcli/smb2/close.c
+++ b/source4/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/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index bb27716a34..f3d158dadd 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/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/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 53236d3b27..68eb922b55 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/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);