From 7a43b32c3b6aeae3572c810fef243d883fe74f28 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 17 Nov 2005 04:03:31 +0000 Subject: r11755: added names for all of the SMB2 qfs info levels (they all map exactly to equivalent SMB qfs levels) (This used to be commit 4ce48d02aa12d6fa699bf8b250b14851870f0096) --- source4/torture/smb2/getinfo.c | 14 +++++++------- source4/torture/smb2/util.c | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'source4/torture/smb2') diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c index 843ef5b5d0..f175b19f89 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -33,13 +33,13 @@ static struct { union smb2_fileinfo dinfo; } levels[] = { #define LEVEL(x) #x, x - { LEVEL(SMB2_GETINFO_FS_01) }, - { LEVEL(SMB2_GETINFO_FS_03) }, - { LEVEL(SMB2_GETINFO_FS_04) }, - { LEVEL(SMB2_GETINFO_FS_ATTRIB_INFO) }, - { LEVEL(SMB2_GETINFO_FS_06) }, - { LEVEL(SMB2_GETINFO_FS_07) }, - { LEVEL(SMB2_GETINFO_FS_08) }, + { LEVEL(SMB2_GETINFO_FS_VOLUME_INFO) }, + { LEVEL(SMB2_GETINFO_FS_SIZE_INFO) }, + { LEVEL(SMB2_GETINFO_FS_DEVICE_INFO) }, + { LEVEL(SMB2_GETINFO_FS_ATTRIBUTE_INFO) }, + { LEVEL(SMB2_GETINFO_FS_QUOTA_INFO) }, + { LEVEL(SMB2_GETINFO_FS_FULL_SIZE_INFO) }, + { LEVEL(SMB2_GETINFO_FS_OBJECTID_INFO) }, { LEVEL(SMB2_GETINFO_SECURITY) }, { LEVEL(SMB2_GETINFO_FILE_BASIC_INFO) }, { LEVEL(SMB2_GETINFO_FILE_SIZE_INFO) }, diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 2c3965831a..6cbc230630 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -48,6 +48,7 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle) d_printf("\twrite_time: %s\n", nt_time_string(tmp_ctx, io.all_info.write_time)); d_printf("\tchange_time: %s\n", nt_time_string(tmp_ctx, io.all_info.change_time)); d_printf("\tattrib: 0x%x\n", io.all_info.file_attr); + d_printf("\tunknown1: 0x%x\n", io.all_info.unknown1); d_printf("\talloc_size: %llu\n", (uint64_t)io.all_info.alloc_size); d_printf("\tsize: %llu\n", (uint64_t)io.all_info.size); d_printf("\tnlink: %u\n", io.all_info.nlink); @@ -60,6 +61,13 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle) d_printf("\tunknown6: 0x%llx\n", io.all_info.unknown6); d_printf("\tfname: '%s'\n", io.all_info.fname); + /* short name, if any */ + status = smb2_getinfo_level(tree, tmp_ctx, handle, + SMB2_GETINFO_FILE_SHORT_INFO, &io); + if (NT_STATUS_IS_OK(status)) { + d_printf("\tshort name: '%s'\n", io.short_info.short_name); + } + /* the EAs, if any */ status = smb2_getinfo_level(tree, tmp_ctx, handle, SMB2_GETINFO_FILE_ALL_EAS, &io); -- cgit