mirror of
https://github.com/samba-team/samba.git
synced 2025-11-25 00:23:52 +03:00
r1080: Make sure to initialise all the returned elements in the SamLogon
reply also initialise the LM session key, when we have it (was failing because the auth code was setting it's length wrong). Andrew Bartlett
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
ad3dd1789e
commit
de97d9df22
@@ -326,10 +326,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
|
||||
so use it only if we otherwise allow LM authentication */
|
||||
|
||||
if (lp_lanman_auth() && lm_pw) {
|
||||
uint8_t first_8_lm_hash[16];
|
||||
memcpy(first_8_lm_hash, lm_pw, 8);
|
||||
memset(first_8_lm_hash + 8, '\0', 8);
|
||||
*lm_sess_key = data_blob(first_8_lm_hash, 16);
|
||||
*lm_sess_key = data_blob(lm_pw, 8);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
} else {
|
||||
@@ -367,11 +364,17 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
|
||||
if (smb_pwd_check_ntlmv1(lm_response,
|
||||
lm_pw, challenge,
|
||||
NULL)) {
|
||||
uint8_t first_8_lm_hash[16];
|
||||
memcpy(first_8_lm_hash, lm_pw, 8);
|
||||
memset(first_8_lm_hash + 8, '\0', 8);
|
||||
*user_sess_key = data_blob(first_8_lm_hash, 16);
|
||||
*lm_sess_key = data_blob(first_8_lm_hash, 16);
|
||||
/* The session key for this response is still very odd.
|
||||
It not very secure, so use it only if we otherwise
|
||||
allow LM authentication */
|
||||
|
||||
if (lp_lanman_auth() && lm_pw) {
|
||||
uint8_t first_8_lm_hash[16];
|
||||
memcpy(first_8_lm_hash, lm_pw, 8);
|
||||
memset(first_8_lm_hash + 8, '\0', 8);
|
||||
*user_sess_key = data_blob(first_8_lm_hash, 16);
|
||||
*lm_sess_key = data_blob(lm_pw, 8);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
}
|
||||
}
|
||||
@@ -431,7 +434,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
|
||||
memcpy(first_8_lm_hash, lm_pw, 8);
|
||||
memset(first_8_lm_hash + 8, '\0', 8);
|
||||
*user_sess_key = data_blob(first_8_lm_hash, 16);
|
||||
*lm_sess_key = data_blob(first_8_lm_hash, 16);
|
||||
*lm_sess_key = data_blob(lm_pw, 8);
|
||||
}
|
||||
return NT_STATUS_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user