diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-06-05 04:32:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:30 -0500 |
| commit | c455b0a935dec8c9644634c496f2b95d7678df05 (patch) | |
| tree | d3bfab9a28a71e4ca7c455ba4ff3635242dcd89f /source4/libcli | |
| parent | 35af8953507c9e6d5310ee07cbe63a735954ffb6 (diff) | |
| download | samba-c455b0a935dec8c9644634c496f2b95d7678df05.tar.gz samba-c455b0a935dec8c9644634c496f2b95d7678df05.tar.bz2 samba-c455b0a935dec8c9644634c496f2b95d7678df05.zip | |
r1028: More consistancy fixes, which should also fix the build.
Andrew Bartlett
(This used to be commit 0d2ae66d3a82134d86084f63c05214e03dfcb48b)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/auth/ntlm_check.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/libcli/auth/ntlm_check.c b/source4/libcli/auth/ntlm_check.c index d12a271420..eab150ad4d 100644 --- a/source4/libcli/auth/ntlm_check.c +++ b/source4/libcli/auth/ntlm_check.c @@ -169,8 +169,8 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx, const DATA_BLOB *challenge, const DATA_BLOB *lm_response, const DATA_BLOB *nt_response, - const DATA_BLOB *lm_interactive_pwd, - const DATA_BLOB *nt_interactive_pwd, + const DATA_BLOB *lm_interactive_password, + const DATA_BLOB *nt_interactive_password, const char *username, const char *client_username, const char *client_domain, @@ -184,14 +184,14 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx, username)); } - if (nt_interactive_pwd && nt_interactive_pwd->length && nt_pw) { - if (nt_interactive_pwd->length != 16) { - DEBUG(3,("ntlm_password_check: Interactive logon: Invalid NT password length (%d) supplied for user %s\n", (int)nt_interactive_pwd->length, + if (nt_interactive_password && nt_interactive_password->length && nt_pw) { + if (nt_interactive_password->length != 16) { + DEBUG(3,("ntlm_password_check: Interactive logon: Invalid NT password length (%d) supplied for user %s\n", (int)nt_interactive_password->length, username)); return NT_STATUS_WRONG_PASSWORD; } - if (memcmp(nt_interactive_pwd->data, nt_pw, 16) == 0) { + if (memcmp(nt_interactive_password->data, nt_pw, 16) == 0) { if (user_sess_key) { *user_sess_key = data_blob(NULL, 16); SMBsesskeygen_ntv1(nt_pw, user_sess_key->data); @@ -203,9 +203,9 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx, return NT_STATUS_WRONG_PASSWORD; } - } else if (lm_interactive_pwd && lm_interactive_pwd->length && lm_pw) { - if (lm_interactive_pwd->length != 16) { - DEBUG(3,("ntlm_password_check: Interactive logon: Invalid LANMAN password length (%d) supplied for user %s\n", (int)lm_interactive_pwd->length, + } else if (lm_interactive_password && lm_interactive_password->length && lm_pw) { + if (lm_interactive_password->length != 16) { + DEBUG(3,("ntlm_password_check: Interactive logon: Invalid LANMAN password length (%d) supplied for user %s\n", (int)lm_interactive_password->length, username)); return NT_STATUS_WRONG_PASSWORD; } @@ -216,7 +216,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx, return NT_STATUS_WRONG_PASSWORD; } - if (memcmp(lm_interactive_pwd->data, lm_pw, 16) == 0) { + if (memcmp(lm_interactive_password->data, lm_pw, 16) == 0) { return NT_STATUS_OK; } else { DEBUG(3,("ntlm_password_check: Interactive logon: LANMAN password check failed for user %s\n", |