CVE-2016-2115: s4:libcli/raw: add smbcli_options.min_protocol
authorStefan Metzmacher <metze@samba.org>
Sat, 27 Feb 2016 03:13:11 +0000 (04:13 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 12 Apr 2016 17:25:26 +0000 (19:25 +0200)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11756

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source4/libcli/raw/libcliraw.h
source4/param/loadparm.c

index 95e69431c1ef99743b8212781c75dc340e941b78..8220cd7c563513f05fb5c8a82c50e0f2b30d85b5 100644 (file)
@@ -95,6 +95,7 @@ struct smbcli_options {
        unsigned int use_spnego:1;
        unsigned int unicode:1;
        unsigned int ntstatus_support:1;
        unsigned int use_spnego:1;
        unsigned int unicode:1;
        unsigned int ntstatus_support:1;
+       int min_protocol;
        int max_protocol;
        uint32_t max_xmit;
        uint16_t max_mux;
        int max_protocol;
        uint32_t max_xmit;
        uint16_t max_mux;
index 71331fb18354b9ff54fc4d360a6678a51bb89988..f53b2dd1807b2d325f9846ee62e828a8240d21dd 100644 (file)
@@ -40,6 +40,7 @@ void lpcfg_smbcli_options(struct loadparm_context *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->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->max_protocol = lpcfg__client_max_protocol(lp_ctx);
        options->unicode = lpcfg_unicode(lp_ctx);
        options->use_oplocks = true;