CVE-2016-2115: s4:libcli/raw: add smbcli_options.min_protocol

[samba.git] / source4 / param / loadparm.c

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 3fbf8528997af44457b652d90d7d43ebf766bdcb..f53b2dd1807b2d325f9846ee62e828a8240d21dd 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -29,20 +29,24 @@
 #include "includes.h"
 #include "lib/param/param.h"
 #include "libcli/raw/libcliraw.h"
+#include "librpc/ndr/libndr.h"
 
 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_maxmux(lp_ctx);
-       options->use_spnego = lpcfg_nt_status_support(lp_ctx) && lpcfg_use_spnego(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->max_protocol = lpcfg_cli_maxprotocol(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();
 }
 
 void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,