summaryrefslogtreecommitdiff
path: root/source3/libsmb/clirap.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2020-06-03 12:54:10 -0700
committerJeremy Allison <jra@samba.org>2020-06-04 17:11:37 +0000
commitb34107f98cae1807b0dcacab9788d14e98c4f95d (patch)
tree69dd0dee76cce840e131ad17e2844888ea7964b9 /source3/libsmb/clirap.c
parentd29884e778733786e572811380349589f5e9afc0 (diff)
downloadsamba-b34107f98cae1807b0dcacab9788d14e98c4f95d.tar.gz
s3: libsmb: Change cli_qfileinfo_basic() to return 32-bit attributes.
Fix all callers. Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/libsmb/clirap.c')
-rw-r--r--source3/libsmb/clirap.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 06954b0e69e..d5baf59c115 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -1310,7 +1310,7 @@ NTSTATUS cli_qfilename(struct cli_state *cli, uint16_t fnum,
****************************************************************************/
NTSTATUS cli_qfileinfo_basic(struct cli_state *cli, uint16_t fnum,
- uint16_t *pattr, off_t *size,
+ uint32_t *pattr, off_t *size,
struct timespec *create_time,
struct timespec *access_time,
struct timespec *write_time,
@@ -1322,23 +1322,15 @@ NTSTATUS cli_qfileinfo_basic(struct cli_state *cli, uint16_t fnum,
NTSTATUS status;
if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
- uint32_t attr = 0;
- status = cli_smb2_qfileinfo_basic(cli,
+ return cli_smb2_qfileinfo_basic(cli,
fnum,
- &attr,
+ pattr,
size,
create_time,
access_time,
write_time,
change_time,
ino);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
- if (pattr != NULL) {
- *pattr = attr;
- }
- return status;
}
/* if its a win95 server then fail this - win95 totally screws it