From 98d5efd3fd67bc48a74705ae7eaee971d63bd7aa Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 3 Jun 2020 20:58:06 -0700 Subject: [PATCH] s3: libsmb: Change cli_setfileinfo_ext() and async version to take a uint32_t attr. Fix all callers. Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke --- source3/libsmb/clirap.c | 6 +++--- source3/libsmb/clirap.h | 4 ++-- source3/torture/test_readdir_timestamp.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index ab7e085e80c..65d3afbcaac 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -781,7 +781,7 @@ struct tevent_req *cli_setfileinfo_ext_send( struct timespec access_time, struct timespec write_time, struct timespec change_time, - uint16_t attr) + uint32_t attr) { struct tevent_req *req = NULL, *subreq = NULL; struct cli_setfileinfo_ext_state *state = NULL; @@ -797,7 +797,7 @@ struct tevent_req *cli_setfileinfo_ext_send( access_time, write_time, change_time, - (uint32_t)attr); + attr); if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) { state->in_data = (DATA_BLOB) { @@ -860,7 +860,7 @@ NTSTATUS cli_setfileinfo_ext( struct timespec access_time, struct timespec write_time, struct timespec change_time, - uint16_t attr) + uint32_t attr) { TALLOC_CTX *frame = NULL; struct tevent_context *ev = NULL; diff --git a/source3/libsmb/clirap.h b/source3/libsmb/clirap.h index 170876160a8..73388f2d268 100644 --- a/source3/libsmb/clirap.h +++ b/source3/libsmb/clirap.h @@ -72,7 +72,7 @@ struct tevent_req *cli_setfileinfo_ext_send( struct timespec access_time, struct timespec write_time, struct timespec change_time, - uint16_t attr); + uint32_t attr); NTSTATUS cli_setfileinfo_ext_recv(struct tevent_req *req); NTSTATUS cli_setfileinfo_ext( struct cli_state *cli, @@ -81,7 +81,7 @@ NTSTATUS cli_setfileinfo_ext( struct timespec access_time, struct timespec write_time, struct timespec change_time, - uint16_t attr); + uint32_t attr); struct tevent_req *cli_qpathinfo2_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, diff --git a/source3/torture/test_readdir_timestamp.c b/source3/torture/test_readdir_timestamp.c index 63a33f880ae..0ae75bb4f7b 100644 --- a/source3/torture/test_readdir_timestamp.c +++ b/source3/torture/test_readdir_timestamp.c @@ -108,7 +108,7 @@ static void create_ts_opened(struct tevent_req *subreq) (struct timespec) { .tv_nsec = SAMBA_UTIME_OMIT }, /* access */ mtime, (struct timespec) { .tv_nsec = SAMBA_UTIME_OMIT }, /* change */ - UINT16_MAX); /* mode */ + UINT32_MAX); /* attr */ if (tevent_req_nomem(subreq, req)) { return; }