From 8c080f28c37a4ada4f3605123a357666881fa3a0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 22 Apr 2020 13:21:40 +0200 Subject: [PATCH] rpcclient: Use struct initializers in cmd_srvsvc_net_file_enum() Bug: https://bugzilla.samba.org/show_bug.cgi?id=14355 Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/rpcclient/cmd_srvsvc.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c index 9c000608463..a9de4608fb9 100644 --- a/source3/rpcclient/cmd_srvsvc.c +++ b/source3/rpcclient/cmd_srvsvc.c @@ -643,9 +643,13 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { - uint32_t info_level = 3; - struct srvsvc_NetFileInfoCtr info_ctr; - struct srvsvc_NetFileCtr3 ctr3; + struct srvsvc_NetFileCtr3 ctr3 = { 0 }; + struct srvsvc_NetFileInfoCtr info_ctr = { + .level = 3, + .ctr = { + .ctr3 = &ctr3, + }, + }; WERROR result; NTSTATUS status; uint32_t preferred_len = 0xffff; @@ -658,14 +662,9 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli, return WERR_OK; } - if (argc == 2) - info_level = atoi(argv[1]); - - ZERO_STRUCT(info_ctr); - ZERO_STRUCT(ctr3); - - info_ctr.level = info_level; - info_ctr.ctr.ctr3 = &ctr3; + if (argc == 2) { + info_ctr.level = atoi(argv[1]); + } status = dcerpc_srvsvc_NetFileEnum(b, mem_ctx, cli->desthost, -- 2.34.1