summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-05-05 13:23:07 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-05-05 13:23:07 +0000
commit9eccc216de6cc3d72265c676d0cef0550aba32a5 (patch)
treee4ff30e446471d8a922d6d61621e49c45e7a5964
parent8be0f0d14553624df358d2079c451a29e32a6a95 (diff)
downloadsamba-9eccc216de6cc3d72265c676d0cef0550aba32a5.tar.gz
samba-9eccc216de6cc3d72265c676d0cef0550aba32a5.tar.bz2
samba-9eccc216de6cc3d72265c676d0cef0550aba32a5.zip
We also get back the LM session key on pure 'NTLM' logins.
Andrew Bartlett (This used to be commit 7342c70b4cecfc1f42c46b19360db6c077604be2)
-rw-r--r--source3/utils/ntlm_auth.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index b18e2d20e0..c4beb4ef1a 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -622,26 +622,32 @@ static BOOL test_ntlm(void)
DATA_BLOB nt_response = data_blob(NULL, 24);
DATA_BLOB session_key = data_blob(NULL, 16);
+ char lm_key[8];
char nt_key[16];
+ char lm_hash[16];
char nt_hash[16];
DATA_BLOB chall = get_challenge();
char *error_string;
+ ZERO_STRUCT(lm_key);
ZERO_STRUCT(nt_key);
+ flags |= WINBIND_PAM_LMKEY;
flags |= WINBIND_PAM_NTKEY;
SMBNTencrypt(opt_password,chall.data,nt_response.data);
E_md4hash(opt_password, nt_hash);
SMBsesskeygen_ntv1(nt_hash, NULL, session_key.data);
+ E_deshash(opt_password, lm_hash);
+
nt_status = contact_winbind_auth_crap(opt_username, opt_domain,
opt_workstation,
&chall,
NULL,
&nt_response,
flags,
- NULL,
+ lm_key,
nt_key,
&error_string);
@@ -655,6 +661,15 @@ static BOOL test_ntlm(void)
return False;
}
+ if (memcmp(lm_hash, lm_key,
+ sizeof(lm_key)) != 0) {
+ DEBUG(1, ("LM Key does not match expectations!\n"));
+ DEBUG(1, ("lm_key:\n"));
+ dump_data(1, lm_key, 8);
+ DEBUG(1, ("expected:\n"));
+ dump_data(1, lm_hash, 8);
+ pass = False;
+ }
if (memcmp(session_key.data, nt_key,
sizeof(nt_key)) != 0) {
DEBUG(1, ("NT Session Key does not match expectations!\n"));