From: Stefan Metzmacher Date: Thu, 2 Jul 2020 11:25:43 +0000 (+0200) Subject: s4:param: use struct initializer in lpcfg_smbcli_options() X-Git-Tag: samba-4.13.0rc1~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f3ab6a113d33bd028f7891dc0c96568c6ab9ce0;p=thirdparty%2Fsamba.git s4:param: use struct initializer in lpcfg_smbcli_options() We should zero all fields not initialiazed explicitly. Signed-off-by: Stefan Metzmacher Reviewed-by: Günther Deschner --- diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 1044a07ee30..e9374416a22 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -35,20 +35,22 @@ void lpcfg_smbcli_options(struct loadparm_context *lp_ctx, struct smbcli_options *options) { - options->max_xmit = lpcfg_max_xmit(lp_ctx); - options->max_mux = lpcfg_max_mux(lp_ctx); - options->use_spnego = lpcfg_nt_status_support(lp_ctx) && lpcfg_client_use_spnego(lp_ctx); - options->signing = lpcfg_client_signing(lp_ctx); - options->request_timeout = SMB_REQUEST_TIMEOUT; - options->ntstatus_support = lpcfg_nt_status_support(lp_ctx); - options->min_protocol = lpcfg_client_min_protocol(lp_ctx); - options->max_protocol = lpcfg__client_max_protocol(lp_ctx); - options->unicode = lpcfg_unicode(lp_ctx); - options->use_oplocks = true; - options->use_level2_oplocks = true; - options->smb2_capabilities = SMB2_CAP_ALL; - options->client_guid = GUID_random(); - options->max_credits = WINDOWS_CLIENT_PURE_SMB2_NEGPROT_INITIAL_CREDIT_ASK; + *options = (struct smbcli_options) { + .max_xmit = lpcfg_max_xmit(lp_ctx), + .max_mux = lpcfg_max_mux(lp_ctx), + .use_spnego = lpcfg_nt_status_support(lp_ctx) && lpcfg_client_use_spnego(lp_ctx), + .signing = lpcfg_client_signing(lp_ctx), + .request_timeout = SMB_REQUEST_TIMEOUT, + .ntstatus_support = lpcfg_nt_status_support(lp_ctx), + .min_protocol = lpcfg_client_min_protocol(lp_ctx), + .max_protocol = lpcfg__client_max_protocol(lp_ctx), + .unicode = lpcfg_unicode(lp_ctx), + .use_oplocks = true, + .use_level2_oplocks = true, + .smb2_capabilities = SMB2_CAP_ALL, + .client_guid = GUID_random(), + .max_credits = WINDOWS_CLIENT_PURE_SMB2_NEGPROT_INITIAL_CREDIT_ASK, + }; } void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,