summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2016-11-03 17:16:43 +0100
committerKarolin Seeger <kseeger@samba.org>2017-09-20 12:00:33 +0200
commit1b6684ea4e9c77229c5b9ef6399eb639ec39e50f (patch)
tree7387ccd8d6c2774fc3912265700c9367f5d61aa8 /source3/lib
parent1217df5f9c507dfa08b584ecd39ce982a8d69ddc (diff)
downloadsamba-1b6684ea4e9c77229c5b9ef6399eb639ec39e50f.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>
Diffstat (limited to 'source3/lib')
-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 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;
}