svn commit: samba r11687 - in branches/SAMBA_4_0/source: libcli/smb2 torture/smb2

[tridge at samba.org]

Author: tridge
Date: 2005-11-11 21:22:15 +0000 (Fri, 11 Nov 2005)
New Revision: 11687

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11687

Log:

filled in 3 more fields in the close reply





Modified:
   branches/SAMBA_4_0/source/libcli/smb2/close.c
   branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
   branches/SAMBA_4_0/source/torture/smb2/connect.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb2/close.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/close.c	2005-11-11 21:11:58 UTC (rev 11686)
+++ branches/SAMBA_4_0/source/libcli/smb2/close.c	2005-11-11 21:22:15 UTC (rev 11687)
@@ -66,11 +66,9 @@
 	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);
 }

Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h	2005-11-11 21:11:58 UTC (rev 11686)
+++ branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h	2005-11-11 21:22:15 UTC (rev 11687)
@@ -133,11 +133,9 @@
 		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;
 };
 

Modified: branches/SAMBA_4_0/source/torture/smb2/connect.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/connect.c	2005-11-11 21:11:58 UTC (rev 11686)
+++ branches/SAMBA_4_0/source/torture/smb2/connect.c	2005-11-11 21:22:15 UTC (rev 11687)
@@ -218,6 +218,9 @@
 	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);