diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-21 19:13:59 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-08-03 18:48:02 +1000 |
| commit | a942401c1f6ee614080cee76c4364afbd729a446 (patch) | |
| tree | e1cc944765753be2b19529bf64eece16069f9873 /source3/include | |
| parent | 9edb9763df07fbceee49d54fd6972c5ffb83d133 (diff) | |
| download | samba-a942401c1f6ee614080cee76c4364afbd729a446.tar.gz samba-a942401c1f6ee614080cee76c4364afbd729a446.tar.bz2 samba-a942401c1f6ee614080cee76c4364afbd729a446.zip | |
s3-ntlmssp Use auth_ntlmssp_*() functions in more places
This allows auth_ntlmssp_get_ntlmssp_state() to be removed.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ntlmssp_wrap.h | 3 | ||||
| -rw-r--r-- | source3/include/smb_crypt.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/include/ntlmssp_wrap.h b/source3/include/ntlmssp_wrap.h index abe1e7a3b9..6924ea655f 100644 --- a/source3/include/ntlmssp_wrap.h +++ b/source3/include/ntlmssp_wrap.h @@ -59,8 +59,6 @@ NTSTATUS auth_ntlmssp_unseal_packet(struct auth_ntlmssp_state *ans, const DATA_BLOB *sig); bool auth_ntlmssp_negotiated_sign(struct auth_ntlmssp_state *ans); bool auth_ntlmssp_negotiated_seal(struct auth_ntlmssp_state *ans); -struct ntlmssp_state *auth_ntlmssp_get_ntlmssp_state( - struct auth_ntlmssp_state *ans); const char *auth_ntlmssp_get_username(struct auth_ntlmssp_state *ans); const char *auth_ntlmssp_get_domain(struct auth_ntlmssp_state *ans); const char *auth_ntlmssp_get_client(struct auth_ntlmssp_state *ans); @@ -73,6 +71,7 @@ NTSTATUS auth_ntlmssp_set_password(struct auth_ntlmssp_state *ans, const char *password); void auth_ntlmssp_and_flags(struct auth_ntlmssp_state *ans, uint32_t flags); void auth_ntlmssp_or_flags(struct auth_ntlmssp_state *ans, uint32_t flags); +void auth_ntlmssp_want_feature(struct auth_ntlmssp_state *ans, uint32_t feature); DATA_BLOB auth_ntlmssp_get_session_key(struct auth_ntlmssp_state *ans); NTSTATUS auth_ntlmssp_update(struct auth_ntlmssp_state *ans, diff --git a/source3/include/smb_crypt.h b/source3/include/smb_crypt.h index a5930d186d..4449a1605d 100644 --- a/source3/include/smb_crypt.h +++ b/source3/include/smb_crypt.h @@ -52,7 +52,7 @@ struct smb_trans_enc_state { uint16 enc_ctx_num; bool enc_on; union { - struct ntlmssp_state *ntlmssp_state; + struct auth_ntlmssp_state *auth_ntlmssp_state; #if defined(HAVE_GSSAPI) && defined(HAVE_KRB5) struct smb_tran_enc_state_gss *gss_state; #endif |