svn commit: samba r16406 - in branches/SAMBA_4_0/source:
libcli/smb2 torture/smb2
metze at samba.org
metze at samba.org
Tue Jun 20 07:03:54 GMT 2006
Author: metze
Date: 2006-06-20 07:03:53 +0000 (Tue, 20 Jun 2006)
New Revision: 16406
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16406
Log:
use the generic smb_handle in smb2_getinfo/smb2_setinfo
metze
Modified:
branches/SAMBA_4_0/source/libcli/smb2/getinfo.c
branches/SAMBA_4_0/source/libcli/smb2/setinfo.c
branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
branches/SAMBA_4_0/source/torture/smb2/scan.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb2/getinfo.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/getinfo.c 2006-06-20 07:02:19 UTC (rev 16405)
+++ branches/SAMBA_4_0/source/libcli/smb2/getinfo.c 2006-06-20 07:03:53 UTC (rev 16406)
@@ -44,7 +44,7 @@
SIVAL(req->out.body, 0x0C, io->in.unknown2);
SIVAL(req->out.body, 0x10, io->in.flags);
SIVAL(req->out.body, 0x14, io->in.flags2);
- smb2_push_handle(req->out.body+0x18, &io->in.handle);
+ smb2_push_handle(req->out.body+0x18, &io->in.file.handle);
smb2_transport_send(req);
@@ -118,7 +118,7 @@
ZERO_STRUCT(b);
b.in.max_response_size = 0x10000;
- b.in.handle = io->generic.in.file.handle;
+ b.in.file.handle = io->generic.in.file.handle;
b.in.level = smb2_level;
if (io->generic.level == RAW_FILEINFO_SEC_DESC) {
@@ -174,7 +174,7 @@
ZERO_STRUCT(b);
b.in.max_response_size = 0x10000;
- b.in.handle = io->generic.handle;
+ b.in.file.handle = io->generic.handle;
b.in.level = smb2_level;
return smb2_getinfo_send(tree, &b);
Modified: branches/SAMBA_4_0/source/libcli/smb2/setinfo.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/setinfo.c 2006-06-20 07:02:19 UTC (rev 16405)
+++ branches/SAMBA_4_0/source/libcli/smb2/setinfo.c 2006-06-20 07:03:53 UTC (rev 16406)
@@ -45,7 +45,7 @@
}
SIVAL(req->out.body, 0x0C, io->in.flags);
- smb2_push_handle(req->out.body+0x10, &io->in.handle);
+ smb2_push_handle(req->out.body+0x10, &io->in.file.handle);
smb2_transport_send(req);
@@ -92,7 +92,7 @@
ZERO_STRUCT(b);
b.in.level = smb2_level;
- b.in.handle = io->generic.in.file.handle;
+ b.in.file.handle = io->generic.in.file.handle;
if (!smb_raw_setfileinfo_passthru(tree, io->generic.level, io, &b.in.blob)) {
return NULL;
}
Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2006-06-20 07:02:19 UTC (rev 16405)
+++ branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2006-06-20 07:03:53 UTC (rev 16406)
@@ -75,7 +75,7 @@
uint32_t unknown2;
uint32_t flags; /* level specific */
uint32_t flags2; /* used by all_eas level */
- struct smb2_handle handle;
+ union smb_handle file;
} in;
struct {
@@ -93,7 +93,7 @@
struct {
uint16_t level;
uint32_t flags;
- struct smb2_handle handle;
+ union smb_handle file;
DATA_BLOB blob;
} in;
};
Modified: branches/SAMBA_4_0/source/torture/smb2/scan.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/scan.c 2006-06-20 07:02:19 UTC (rev 16405)
+++ branches/SAMBA_4_0/source/torture/smb2/scan.c 2006-06-20 07:03:53 UTC (rev 16406)
@@ -74,7 +74,7 @@
for (i=0;i<0x100;i++) {
io.in.level = (i<<8) | c;
- io.in.handle = fhandle;
+ io.in.file.handle = fhandle;
status = smb2_getinfo(tree, mem_ctx, &io);
if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) &&
!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) &&
@@ -84,7 +84,7 @@
dump_data(1, io.out.blob.data, io.out.blob.length);
}
- io.in.handle = dhandle;
+ io.in.file.handle = dhandle;
status = smb2_getinfo(tree, mem_ctx, &io);
if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) &&
!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) &&
@@ -132,7 +132,7 @@
for (c=1;c<5;c++) {
for (i=0;i<0x100;i++) {
io.in.level = (i<<8) | c;
- io.in.handle = handle;
+ io.in.file.handle = handle;
status = smb2_setinfo(tree, &io);
if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) &&
!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
More information about the samba-cvs
mailing list