diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-12-26 14:23:15 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-01-05 17:17:28 +0100 |
| commit | 3042e38d519411e774e110b16a2eeeaef4b25a65 (patch) | |
| tree | e8586dd2c248ad1091c36d52bf69e031201bd0f4 /source3/include | |
| parent | 0c0c23f3fe6f7c55d69d6ca19f8252b12aa8fe5a (diff) | |
| download | samba-3042e38d519411e774e110b16a2eeeaef4b25a65.tar.gz samba-3042e38d519411e774e110b16a2eeeaef4b25a65.tar.bz2 samba-3042e38d519411e774e110b16a2eeeaef4b25a65.zip | |
s3-auth use gensec directly rather than via auth_generic_state
This is possible because the s3 gensec modules are started as
normal gensec modules, so we do not need a wrapper any more.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/auth.h | 2 | ||||
| -rw-r--r-- | source3/include/ntlmssp_wrap.h | 3 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h index 16bf1e6f14..522dc59a37 100644 --- a/source3/include/auth.h +++ b/source3/include/auth.h @@ -128,7 +128,7 @@ struct auth_init_function_entry { struct auth_init_function_entry *prev, *next; }; -struct auth_generic_state; +struct gensec_security; /* Changed from 1 -> 2 to add the logon_parameters field. */ /* Changed from 2 -> 3 when we reworked many auth structures to use IDL or be in common with Samba4 */ diff --git a/source3/include/ntlmssp_wrap.h b/source3/include/ntlmssp_wrap.h index fb98309ab9..07f474f103 100644 --- a/source3/include/ntlmssp_wrap.h +++ b/source3/include/ntlmssp_wrap.h @@ -26,9 +26,6 @@ struct gensec_security; extern const struct gensec_security_ops gensec_ntlmssp3_server_ops; struct auth_generic_state { - /* used only by server implementation */ - struct auth_context *auth_context; - /* used only by the client implementation */ struct cli_credentials *credentials; diff --git a/source3/include/smb.h b/source3/include/smb.h index 2221b72763..2adfa36c8c 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1215,7 +1215,7 @@ typedef struct user_struct { struct auth_session_info *session_info; - struct auth_generic_state *auth_ntlmssp_state; + struct gensec_security *gensec_security; } user_struct; /* |