sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

s3-ntlm_auth: allow ntlm_auth --diagnostics to pass again

Browse Source 
This still requires that the server permit LM passwords, but our s3dc test
environment has this enabled.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-02-19 10:56:12 +11:00
parent 3ebd79a6d0
commit f91c616176
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/utils/ntlm_auth.c
View File

@ -390,6 +390,7 @@ NTSTATUS contact_winbind_auth_crap(const char *username,
const DATA_BLOB *lm_response, const DATA_BLOB *lm_response,
const DATA_BLOB *nt_response, const DATA_BLOB *nt_response,
uint32 flags, uint32 flags,
uint32 extra_logon_parameters,
uint8 lm_key[8], uint8 lm_key[8],
uint8 user_session_key[16], uint8 user_session_key[16],
char **error_string, char **error_string,
@ -409,7 +410,8 @@ NTSTATUS contact_winbind_auth_crap(const char *username,
request.flags = flags; request.flags = flags;
request.data.auth_crap.logon_parameters = MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT | MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT; request.data.auth_crap.logon_parameters = extra_logon_parameters
| MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT | MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT;
if (require_membership_of_sid) if (require_membership_of_sid)
fstrcpy(request.data.auth_crap.require_membership_of_sid, require_membership_of_sid); fstrcpy(request.data.auth_crap.require_membership_of_sid, require_membership_of_sid);
@ -585,6 +587,7 @@ static NTSTATUS winbind_pw_check(struct ntlmssp_state *ntlmssp_state, TALLOC_CTX
&ntlmssp_state->lm_resp, &ntlmssp_state->lm_resp,
&ntlmssp_state->nt_resp, &ntlmssp_state->nt_resp,
WBFLAG_PAM_LMKEY | WBFLAG_PAM_USER_SESSION_KEY | WBFLAG_PAM_UNIX_NAME, WBFLAG_PAM_LMKEY | WBFLAG_PAM_USER_SESSION_KEY | WBFLAG_PAM_UNIX_NAME,
0,
lm_key, user_sess_key, lm_key, user_sess_key,
&error_string, &unix_name); &error_string, &unix_name);
@ -2032,7 +2035,7 @@ static void manage_ntlm_server_1_request(struct ntlm_auth_state *state,
&challenge, &challenge,
&lm_response, &lm_response,
&nt_response, &nt_response,
flags, flags, 0,
lm_key, lm_key,
user_session_key, user_session_key,
&error_string, &error_string,
@ -2486,7 +2489,7 @@ static bool check_auth_crap(void)
&opt_challenge, &opt_challenge,
&opt_lm_response, &opt_lm_response,
&opt_nt_response, &opt_nt_response,
flags, flags, 0,
(unsigned char *)lm_key, (unsigned char *)lm_key,
(unsigned char *)user_session_key, (unsigned char *)user_session_key,
&error_string, NULL); &error_string, NULL);

10
source3/utils/ntlm_auth_diagnostics.c
View File

@ -98,7 +98,7 @@ static bool test_lm_ntlm_broken(enum ntlm_break break_which)
&chall, &chall,
&lm_response, &lm_response,
&nt_response, &nt_response,
flags, flags, 0,
lm_key, lm_key,
user_session_key, user_session_key,
&error_string, NULL); &error_string, NULL);
@ -197,7 +197,7 @@ static bool test_ntlm_in_lm(void)
&chall, &chall,
&nt_response, &nt_response,
NULL, NULL,
flags, flags, 0,
lm_key, lm_key,
user_session_key, user_session_key,
&error_string, NULL); &error_string, NULL);
@ -268,7 +268,7 @@ static bool test_ntlm_in_both(void)
&chall, &chall,
&nt_response, &nt_response,
&nt_response, &nt_response,
flags, flags, 0,
lm_key, lm_key,
user_session_key, user_session_key,
&error_string, NULL); &error_string, NULL);
@ -359,7 +359,7 @@ static bool test_lmv2_ntlmv2_broken(enum ntlm_break break_which)
&chall, &chall,
&lmv2_response, &lmv2_response,
&ntlmv2_response, &ntlmv2_response,
flags, flags, 0,
NULL, NULL,
user_session_key, user_session_key,
&error_string, NULL); &error_string, NULL);
@ -510,7 +510,7 @@ static bool test_plaintext(enum ntlm_break break_which)
&chall, &chall,
&lm_response, &lm_response,
&nt_response, &nt_response,
flags, flags, MSV1_0_CLEARTEXT_PASSWORD_ALLOWED,
lm_key, lm_key,
user_session_key, user_session_key,
&error_string, NULL); &error_string, NULL);

1
source3/utils/ntlm_auth_proto.h
View File

@ -36,6 +36,7 @@ NTSTATUS contact_winbind_auth_crap(const char *username,
const DATA_BLOB *lm_response, const DATA_BLOB *lm_response,
const DATA_BLOB *nt_response, const DATA_BLOB *nt_response,
uint32 flags, uint32 flags,
uint32 extra_logon_parameters,
uint8 lm_key[8], uint8 lm_key[8],
uint8 user_session_key[16], uint8 user_session_key[16],
char **error_string, char **error_string,