svn commit: samba r11755 - in branches/SAMBA_4_0/source:
libcli/smb2 torture/smb2
tridge at samba.org
tridge at samba.org
Thu Nov 17 04:03:32 GMT 2005
Author: tridge
Date: 2005-11-17 04:03:31 +0000 (Thu, 17 Nov 2005)
New Revision: 11755
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11755
Log:
added names for all of the SMB2 qfs info levels (they all map exactly
to equivalent SMB qfs levels)
Modified:
branches/SAMBA_4_0/source/libcli/smb2/getinfo.c
branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
branches/SAMBA_4_0/source/torture/smb2/getinfo.c
branches/SAMBA_4_0/source/torture/smb2/util.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb2/getinfo.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/getinfo.c 2005-11-17 03:32:38 UTC (rev 11754)
+++ branches/SAMBA_4_0/source/libcli/smb2/getinfo.c 2005-11-17 04:03:31 UTC (rev 11755)
@@ -178,6 +178,7 @@
io->all_info.write_time = smbcli_pull_nttime(blob.data, 0x10);
io->all_info.change_time = smbcli_pull_nttime(blob.data, 0x18);
io->all_info.file_attr = IVAL(blob.data, 0x20);
+ io->all_info.unknown1 = IVAL(blob.data, 0x24);
io->all_info.alloc_size = BVAL(blob.data, 0x28);
io->all_info.size = BVAL(blob.data, 0x30);
io->all_info.nlink = IVAL(blob.data, 0x38);
Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2005-11-17 03:32:38 UTC (rev 11754)
+++ branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2005-11-17 04:03:31 UTC (rev 11755)
@@ -191,13 +191,13 @@
};
/* fs information levels */
-#define SMB2_GETINFO_FS_01 0x0102
-#define SMB2_GETINFO_FS_03 0x0302
-#define SMB2_GETINFO_FS_04 0x0402
-#define SMB2_GETINFO_FS_ATTRIB_INFO 0x0502
-#define SMB2_GETINFO_FS_06 0x0602
-#define SMB2_GETINFO_FS_07 0x0702
-#define SMB2_GETINFO_FS_08 0x0802
+#define SMB2_GETINFO_FS_VOLUME_INFO 0x0102
+#define SMB2_GETINFO_FS_SIZE_INFO 0x0302
+#define SMB2_GETINFO_FS_DEVICE_INFO 0x0402
+#define SMB2_GETINFO_FS_ATTRIBUTE_INFO 0x0502
+#define SMB2_GETINFO_FS_QUOTA_INFO 0x0602
+#define SMB2_GETINFO_FS_FULL_SIZE_INFO 0x0702
+#define SMB2_GETINFO_FS_OBJECTID_INFO 0x0802
/* class 3 levels */
#define SMB2_GETINFO_SECURITY 0x0003
@@ -295,7 +295,7 @@
NTTIME write_time;
NTTIME change_time;
uint32_t file_attr;
- /* uint32_t _pad; */
+ uint32_t unknown1;
uint64_t alloc_size;
uint64_t size;
uint32_t nlink;
Modified: branches/SAMBA_4_0/source/torture/smb2/getinfo.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/getinfo.c 2005-11-17 03:32:38 UTC (rev 11754)
+++ branches/SAMBA_4_0/source/torture/smb2/getinfo.c 2005-11-17 04:03:31 UTC (rev 11755)
@@ -33,13 +33,13 @@
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) },
Modified: branches/SAMBA_4_0/source/torture/smb2/util.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/util.c 2005-11-17 03:32:38 UTC (rev 11754)
+++ branches/SAMBA_4_0/source/torture/smb2/util.c 2005-11-17 04:03:31 UTC (rev 11755)
@@ -48,6 +48,7 @@
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 @@
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);
More information about the samba-cvs
mailing list