From 8ae2851ebc91df7dded6be6a726bc809e86cc511 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 3 Jun 2020 13:56:37 -0700 Subject: s3: libsmb: Make cli_list_old() take 32-bit attribute. Only uses 16 on the wire. No change needed in callers. Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke --- source3/libsmb/clilist.c | 6 +++--- source3/libsmb/proto.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3') diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index b2327ed97ad..b453900b3f4 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -361,7 +361,7 @@ struct cli_list_old_state { uint16_t vwv[2]; char *mask; int num_asked; - uint16_t attribute; + uint32_t attribute; uint8_t search_status[23]; bool first; bool done; @@ -374,7 +374,7 @@ static struct tevent_req *cli_list_old_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, const char *mask, - uint16_t attribute) + uint32_t attribute) { struct tevent_req *req, *subreq; struct cli_list_old_state *state; @@ -568,7 +568,7 @@ static NTSTATUS cli_list_old_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, } NTSTATUS cli_list_old(struct cli_state *cli, const char *mask, - uint16_t attribute, + uint32_t attribute, NTSTATUS (*fn)(const char *, struct file_info *, const char *, void *), void *state) { diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index c7cf3702bde..734f4749b5b 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -755,7 +755,7 @@ NTSTATUS cli_posix_whoami(struct cli_state *cli, NTSTATUS is_bad_finfo_name(const struct cli_state *cli, const struct file_info *finfo); -NTSTATUS cli_list_old(struct cli_state *cli,const char *Mask,uint16_t attribute, +NTSTATUS cli_list_old(struct cli_state *cli,const char *Mask,uint32_t attribute, NTSTATUS (*fn)(const char *, struct file_info *, const char *, void *), void *state); NTSTATUS cli_list_trans(struct cli_state *cli, const char *mask, -- cgit v1.2.1