From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 3 Nov 2016 16:16:43 +0000 (+0100)
Subject: CVE-2017-12150: s3:lib: get_cmdline_auth_info_signing_state smb_encrypt SMB_SIGNING_R... 
X-Git-Tag: samba-4.7.0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b6684ea4e9c77229c5b9ef6399eb639ec39e50f;p=thirdparty%2Fsamba.git

CVE-2017-12150: s3:lib: get_cmdline_auth_info_signing_state smb_encrypt SMB_SIGNING_REQUIRED

This is an addition to the fixes for CVE-2015-5296.

It applies to smb2mount -e, smbcacls -e and smbcquotas -e.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12997

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/lib/util_cmdline.c b/source3/lib/util_cmdline.c
index 80142e2f82b..90ee67c4cb7 100644
--- a/source3/lib/util_cmdline.c
+++ b/source3/lib/util_cmdline.c
@@ -265,6 +265,9 @@ void set_cmdline_auth_info_signing_state_raw(struct user_auth_info *auth_info,
 
 int get_cmdline_auth_info_signing_state(const struct user_auth_info *auth_info)
 {
+	if (auth_info->smb_encrypt) {
+		return SMB_SIGNING_REQUIRED;
+	}
 	return auth_info->signing_state;
 }