diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-04-03 15:41:32 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-04-03 15:41:32 +0000 |
| commit | c2ff214772ac1934731938b3804d37e514e45c32 (patch) | |
| tree | 6e7219577a7f1d2ad3e573bc220e07d99ec3708e /source3/include | |
| parent | c2699d25462e8684bded32adada78addf88b6df5 (diff) | |
| download | samba-c2ff214772ac1934731938b3804d37e514e45c32.tar.gz samba-c2ff214772ac1934731938b3804d37e514e45c32.tar.bz2 samba-c2ff214772ac1934731938b3804d37e514e45c32.zip | |
Fix most of bug #169.
For a (very) long time, we have had a bug in Samba were an NTLMv2-only
PDC would fail, because it converted the password into NTLM format for
checking.
This patch performs the direct comparison required for interactive
logons to function in this situation. It also removes the 'auth flags', which
simply where not ever used.
Natrually, this plays with the size of structures, so rebuild, rebuild
rebuild...
Andrew Bartlett
(This used to be commit 9598593bcf2d877b1d08cd6a7323ee0bc160d4ba)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/auth.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h index ecf4d539d8..8f52512e6a 100644 --- a/source3/include/auth.h +++ b/source3/include/auth.h @@ -27,37 +27,17 @@ typedef struct normal_string char *str; } AUTH_STR; -/* AUTH_UNISTR - unicode string or buffer */ -typedef struct unicode_string -{ - int len; - uchar *unistr; -} AUTH_UNISTR; - -typedef struct interactive_password -{ - OWF_INFO lm_owf; /* LM OWF Password */ - OWF_INFO nt_owf; /* NT OWF Password */ -} auth_interactive_password; - -#define AUTH_FLAG_NONE 0x000000 -#define AUTH_FLAG_PLAINTEXT 0x000001 -#define AUTH_FLAG_LM_RESP 0x000002 -#define AUTH_FLAG_NTLM_RESP 0x000004 -#define AUTH_FLAG_NTLMv2_RESP 0x000008 - typedef struct auth_usersupplied_info { DATA_BLOB lm_resp; DATA_BLOB nt_resp; - auth_interactive_password * interactive_password; + DATA_BLOB lm_interactive_pwd; + DATA_BLOB nt_interactive_pwd; DATA_BLOB plaintext_password; BOOL encrypted; - uint32 auth_flags; - AUTH_STR client_domain; /* domain name string */ AUTH_STR domain; /* domain name after mapping */ AUTH_STR internal_username; /* username after mapping */ |