From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Aug 2010 09:01:34 +0000 (+1000)
Subject: s3:ntlmssp Don't use the lm key if the user didn't supply one.
X-Git-Url: http://git.samba.org/?p=abartlet%2Fsamba.git%2F.git;a=commitdiff_plain;h=3c0a17a1274df1b38b3acd9335192cd78730b01c

s3:ntlmssp Don't use the lm key if the user didn't supply one.

This may help to avoid a number of possible MITM attacks where LM_KEY is
spoofed into the session.  If the login wasn't with lanman
(and so the user chose to disclose their lanman response),
don't disclose back anything based on their lanman password.

Andrew Bartlett

Signed-off-by: Günther Deschner <gd@samba.org>
---

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 2ad8d8783a3..4398ecf4a33 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -635,9 +635,9 @@ static NTSTATUS ntlmssp_server_auth(struct ntlmssp_state *ntlmssp_state,
 				if (session_key.data == NULL) {
 					return NT_STATUS_NO_MEMORY;
 				}
-				SMBsesskeygen_lm_sess_key(
-					lm_session_key.data, zeros,
-					session_key.data);
+				SMBsesskeygen_lm_sess_key(zeros, zeros,
+							  session_key.data);
+				DEBUG(10,("ntlmssp_server_auth: Created NTLM session key.\n"));
 			}
 			dump_data_pw("LM session key:\n", session_key.data,
 				     session_key.length);