summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2016-11-03 17:16:43 +0100
committerKarolin Seeger <kseeger@samba.org>2017-09-13 09:19:48 -0700
commit428ede3dd3bbf3bba86ca1b321bedfcc9aebba79 (patch)
tree7dda7a467acc95d86de7d4dedf481c1fca78e309
parent084bf9870be26c5acb093df1373298717b6662bd (diff)
downloadsamba-428ede3dd3bbf3bba86ca1b321bedfcc9aebba79.tar.gz
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>
-rw-r--r--source3/lib/util_cmdline.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/lib/util_cmdline.c b/source3/lib/util_cmdline.c
index 80c3ecdb462..539fa55d3a2 100644
--- a/source3/lib/util_cmdline.c
+++ b/source3/lib/util_cmdline.c
@@ -123,6 +123,9 @@ bool set_cmdline_auth_info_signing_state(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;
}