From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 27 Feb 2016 03:13:11 +0000 (+0100)
Subject: CVE-2016-2115: s4:libcli/raw: add smbcli_options.min_protocol
X-Git-Tag: talloc-2.1.7~395
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=35ce75ec9eb0e3f2113a089b59967dddf3a122f9

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

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>
---

diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index 95e69431c1e..8220cd7c563 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -95,6 +95,7 @@ struct smbcli_options {
 	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;
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 71331fb1835..f53b2dd1807 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -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->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;