The Samba-Bugzilla – Attachment 13780 Details for
Bug 13138
libsmbclient: smbc_statvfs over SMB2/SMB3 connection doesn't return any values
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git-am fix for master.
0001-s3-libsmb-smbc_statvfs-is-missing-the-supporting-SMB.patch (text/plain), 5.17 KB, created by
Jeremy Allison
on 2017-11-14 22:04:11 UTC
(
hide
)
Description:
git-am fix for master.
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2017-11-14 22:04:11 UTC
Size:
5.17 KB
patch
obsolete
>From 7125260bde444838a56e48716421e240074328ef Mon Sep 17 00:00:00 2001 >From: Jeremy Allison <jra@samba.org> >Date: Tue, 14 Nov 2017 13:52:03 -0800 >Subject: [PATCH] s3: libsmb: smbc_statvfs is missing the supporting SMB2 > calls. > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=13138 > >Signed-off-by: Jeremy Allison <jra@samba.org> >--- > source3/libsmb/cli_smb2_fnum.c | 98 ++++++++++++++++++++++++++++++++++++++++++ > source3/libsmb/cli_smb2_fnum.h | 6 +++ > source3/libsmb/clifsinfo.c | 9 ++++ > 3 files changed, 113 insertions(+) > >diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c >index b8179b0a48c..4868f5e7d14 100644 >--- a/source3/libsmb/cli_smb2_fnum.c >+++ b/source3/libsmb/cli_smb2_fnum.c >@@ -1997,6 +1997,103 @@ NTSTATUS cli_smb2_dskattr(struct cli_state *cli, const char *path, > Synchronous only. > ***************************************************************/ > >+NTSTATUS cli_smb2_get_fs_full_size_info(struct cli_state *cli, >+ uint64_t *total_allocation_units, >+ uint64_t *caller_allocation_units, >+ uint64_t *actual_allocation_units, >+ uint64_t *sectors_per_allocation_unit, >+ uint64_t *bytes_per_sector) >+{ >+ NTSTATUS status; >+ uint16_t fnum = 0xffff; >+ DATA_BLOB outbuf = data_blob_null; >+ struct smb2_hnd *ph = NULL; >+ TALLOC_CTX *frame = talloc_stackframe(); >+ >+ if (smbXcli_conn_has_async_calls(cli->conn)) { >+ /* >+ * Can't use sync call while an async call is in flight >+ */ >+ status = NT_STATUS_INVALID_PARAMETER; >+ goto fail; >+ } >+ >+ if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) { >+ status = NT_STATUS_INVALID_PARAMETER; >+ goto fail; >+ } >+ >+ /* First open the top level directory. */ >+ status = >+ cli_smb2_create_fnum(cli, "", 0, /* create_flags */ >+ FILE_READ_ATTRIBUTES, /* desired_access */ >+ FILE_ATTRIBUTE_DIRECTORY, /* file attributes */ >+ FILE_SHARE_READ | FILE_SHARE_WRITE | >+ FILE_SHARE_DELETE, /* share_access */ >+ FILE_OPEN, /* create_disposition */ >+ FILE_DIRECTORY_FILE, /* create_options */ >+ &fnum, >+ NULL); >+ >+ if (!NT_STATUS_IS_OK(status)) { >+ goto fail; >+ } >+ >+ status = map_fnum_to_smb2_handle(cli, fnum, &ph); >+ if (!NT_STATUS_IS_OK(status)) { >+ goto fail; >+ } >+ >+ /* getinfo on the returned handle with info_type SMB2_GETINFO_FS (2), >+ level 7 (SMB_FS_FULL_SIZE_INFORMATION). */ >+ >+ status = smb2cli_query_info(cli->conn, >+ cli->timeout, >+ cli->smb2.session, >+ cli->smb2.tcon, >+ SMB2_GETINFO_FS, /* in_info_type */ >+ /* in_file_info_class */ >+ SMB_FS_FULL_SIZE_INFORMATION - 1000, >+ 0xFFFF, /* in_max_output_length */ >+ NULL, /* in_input_buffer */ >+ 0, /* in_additional_info */ >+ 0, /* in_flags */ >+ ph->fid_persistent, >+ ph->fid_volatile, >+ frame, >+ &outbuf); >+ if (!NT_STATUS_IS_OK(status)) { >+ goto fail; >+ } >+ >+ if (outbuf.length < 32) { >+ status = NT_STATUS_INVALID_NETWORK_RESPONSE; >+ goto fail; >+ } >+ >+ *total_allocation_units = BIG_UINT(outbuf.data, 0); >+ *caller_allocation_units = BIG_UINT(outbuf.data, 8); >+ *actual_allocation_units = BIG_UINT(outbuf.data, 16); >+ *sectors_per_allocation_unit = (uint64_t)IVAL(outbuf.data, 24); >+ *bytes_per_sector = (uint64_t)IVAL(outbuf.data, 28); >+ >+fail: >+ >+ if (fnum != 0xffff) { >+ cli_smb2_close_fnum(cli, fnum); >+ } >+ >+ cli->raw_status = status; >+ >+ TALLOC_FREE(frame); >+ return status; >+} >+ >+/*************************************************************** >+ Wrapper that allows SMB2 to query file system sizes. >+ Synchronous only. >+***************************************************************/ >+ > NTSTATUS cli_smb2_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr) > { > NTSTATUS status; >@@ -2071,6 +2168,7 @@ fail: > return status; > } > >+ > /*************************************************************** > Wrapper that allows SMB2 to query a security descriptor. > Synchronous only. >diff --git a/source3/libsmb/cli_smb2_fnum.h b/source3/libsmb/cli_smb2_fnum.h >index a6c36275eb8..793efc719ea 100644 >--- a/source3/libsmb/cli_smb2_fnum.h >+++ b/source3/libsmb/cli_smb2_fnum.h >@@ -136,6 +136,12 @@ NTSTATUS cli_smb2_dskattr(struct cli_state *cli, > uint64_t *total, > uint64_t *avail); > NTSTATUS cli_smb2_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr); >+NTSTATUS cli_smb2_get_fs_full_size_info(struct cli_state *cli, >+ uint64_t *total_allocation_units, >+ uint64_t *caller_allocation_units, >+ uint64_t *actual_allocation_units, >+ uint64_t *sectors_per_allocation_unit, >+ uint64_t *bytes_per_sector); > NTSTATUS cli_smb2_query_security_descriptor(struct cli_state *cli, > uint16_t fnum, > uint32_t sec_info, >diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c >index 119b1216fb2..46236390022 100644 >--- a/source3/libsmb/clifsinfo.c >+++ b/source3/libsmb/clifsinfo.c >@@ -439,6 +439,15 @@ NTSTATUS cli_get_fs_full_size_info(struct cli_state *cli, > uint32_t rdata_count; > NTSTATUS status; > >+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) { >+ return cli_smb2_get_fs_full_size_info(cli, >+ total_allocation_units, >+ caller_allocation_units, >+ actual_allocation_units, >+ sectors_per_allocation_unit, >+ bytes_per_sector); >+ } >+ > SSVAL(setup, 0, TRANSACT2_QFSINFO); > SSVAL(param, 0, SMB_FS_FULL_SIZE_INFORMATION); > >-- >2.15.0.448.gf294e3d99a-goog >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=13780">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 13138
:
13780
|
13781
|
13784