diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 02:55:00 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 02:55:00 +0000 |
| commit | d1221c9b6c369113a531063737890b58d89bf6fe (patch) | |
| tree | efc7b8b8d33b675404dc7c5bc018db47a4136212 /source3/include | |
| parent | e075e1dfa9a88b5edadc9c989200a52f48182cef (diff) | |
| download | samba-d1221c9b6c369113a531063737890b58d89bf6fe.tar.gz samba-d1221c9b6c369113a531063737890b58d89bf6fe.tar.bz2 samba-d1221c9b6c369113a531063737890b58d89bf6fe.zip | |
Merge from HEAD client-side authentication changes:
- new kerberos code, allowing the account to change it's own password
without special SD settings required
- NTLMSSP client code, now seperated from cliconnect.c
- NTLMv2 client code
- SMB signing fixes
Andrew Bartlett
(This used to be commit 837680ca517982f2e5944730581a83012d4181ae)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ads.h | 3 | ||||
| -rw-r--r-- | source3/include/client.h | 7 | ||||
| -rw-r--r-- | source3/include/ntlmssp.h | 20 |
3 files changed, 29 insertions, 1 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index 7f23e6506b..304a997b2c 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -205,3 +205,6 @@ typedef void **ADS_MODLIST; #define ADS_AUTH_NO_BIND 0x02 #define ADS_AUTH_ANON_BIND 0x04 #define ADS_AUTH_SIMPLE_BIND 0x08 + +/* Kerberos environment variable names */ +#define KRB5_ENV_CCNAME "KRB5CCNAME" diff --git a/source3/include/client.h b/source3/include/client.h index 853ee7ae42..73e29a1fff 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -62,9 +62,10 @@ typedef struct smb_sign_info { BOOL negotiated_smb_signing; BOOL temp_smb_signing; size_t mac_key_len; - uint8 mac_key[44]; + uint8 mac_key[64]; uint32 send_seq_num; uint32 reply_seq_num; + BOOL allow_smb_signing; } smb_sign_info; struct cli_state { @@ -121,6 +122,10 @@ struct cli_state { smb_sign_info sign_info; + /* the session key for this CLI, outside + any per-pipe authenticaion */ + unsigned char user_session_key[16]; + /* * Only used in NT domain calls. */ diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h index 79d0446a77..4fa4259a6a 100644 --- a/source3/include/ntlmssp.h +++ b/source3/include/ntlmssp.h @@ -86,5 +86,25 @@ typedef struct ntlmssp_state const char *(*get_domain)(void); int server_role; + uint32 expected_state; } NTLMSSP_STATE; +typedef struct ntlmssp_client_state +{ + TALLOC_CTX *mem_ctx; + BOOL unicode; + BOOL use_ntlmv2; + char *user; + char *domain; + char *workstation; + char *password; + + const char *(*get_global_myname)(void); + const char *(*get_domain)(void); + + DATA_BLOB session_key; + + uint32 neg_flags; + +} NTLMSSP_CLIENT_STATE; + |