diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-06-20 07:03:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:13 -0500 |
| commit | d3b3436ce1a71464b0f1a9ffa69643cd5c816004 (patch) | |
| tree | 4cc3bf72b3a1ecfe11a02ba7c5ce8d59e2252d44 /source4/libcli | |
| parent | 15db7a53e8273360fcaf6d8b7896d5f2b0d43c47 (diff) | |
| download | samba-d3b3436ce1a71464b0f1a9ffa69643cd5c816004.tar.gz samba-d3b3436ce1a71464b0f1a9ffa69643cd5c816004.tar.bz2 samba-d3b3436ce1a71464b0f1a9ffa69643cd5c816004.zip | |
r16406: use the generic smb_handle in smb2_getinfo/smb2_setinfo
metze
(This used to be commit dcc02df8297162a7fd913560194d9e821798dbe0)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/smb2/getinfo.c | 6 | ||||
| -rw-r--r-- | source4/libcli/smb2/setinfo.c | 4 | ||||
| -rw-r--r-- | source4/libcli/smb2/smb2_calls.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source4/libcli/smb2/getinfo.c b/source4/libcli/smb2/getinfo.c index 57a363b63f..2af8032938 100644 --- a/source4/libcli/smb2/getinfo.c +++ b/source4/libcli/smb2/getinfo.c @@ -44,7 +44,7 @@ struct smb2_request *smb2_getinfo_send(struct smb2_tree *tree, struct smb2_getin 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 @@ struct smb2_request *smb2_getinfo_file_send(struct smb2_tree *tree, union smb_fi 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 @@ struct smb2_request *smb2_getinfo_fs_send(struct smb2_tree *tree, union smb_fsin 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); diff --git a/source4/libcli/smb2/setinfo.c b/source4/libcli/smb2/setinfo.c index 432034b13b..c5fc0577d6 100644 --- a/source4/libcli/smb2/setinfo.c +++ b/source4/libcli/smb2/setinfo.c @@ -45,7 +45,7 @@ struct smb2_request *smb2_setinfo_send(struct smb2_tree *tree, struct smb2_setin } 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 @@ struct smb2_request *smb2_setinfo_file_send(struct smb2_tree *tree, union smb_se 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; } diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h index 6bee0dec91..f870ddb38a 100644 --- a/source4/libcli/smb2/smb2_calls.h +++ b/source4/libcli/smb2/smb2_calls.h @@ -75,7 +75,7 @@ struct smb2_getinfo { 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 smb2_setinfo { struct { uint16_t level; uint32_t flags; - struct smb2_handle handle; + union smb_handle file; DATA_BLOB blob; } in; }; |